commit caafba4078dc869b3686c24e7046319550189f27
author Eric Laurent <elaurent@google.com> Sat Jul 13 10:12:45 2019 -0700
committer Eric Laurent <elaurent@google.com> Fri Jul 19 14:51:31 2019 -0700
tree 82c670cded175b0678e60ae2284ebd7c8eb2d451
parent 62fda2924e3b369d5e6befde074d96b3be2700ed

audio policy: fix virtual called from constructor

Call initialize() after constructing AudioPolicyManager
from factory to avoid calling virtual methods from constructor.

Bug: 136491567
Test: make
Change-Id: Ie0b591d90e643b1fd1c326f9731dc656b38230dc

services/audiopolicy/manager/AudioPolicyFactory.cpp

diff --git a/services/audiopolicy/manager/AudioPolicyFactory.cpp b/services/audiopolicy/manager/AudioPolicyFactory.cpp
index 7aff6a9..476a1ec 100644
--- a/services/audiopolicy/manager/AudioPolicyFactory.cpp
+++ b/services/audiopolicy/manager/AudioPolicyFactory.cpp
@@ -21,7 +21,13 @@
 extern "C" AudioPolicyInterface* createAudioPolicyManager(
         AudioPolicyClientInterface *clientInterface)
 {
-    return new AudioPolicyManager(clientInterface);
+    AudioPolicyManager *apm = new AudioPolicyManager(clientInterface);
+    status_t status = apm->initialize();
+    if (status != NO_ERROR) {
+        delete apm;
+        apm = nullptr;
+    }
+    return apm;
 }
 
 extern "C" void destroyAudioPolicyManager(AudioPolicyInterface *interface)