commit 20e6916035865710b7a30ac7f2eac1311e2c2e70
author Yunlian Jiang <yunlian@google.com> Wed Jul 12 00:12:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 12 00:12:20 2017 +0000
tree dd8d338def2cf05278625a09551978faa6f8a6a7
parent 8a9f420455f8fd5b97910747416582eea5a1c29f
parent 31dcf0154d4ba4650915987b666a6cea0048339d

Merge "Fix memory leak warning." am: ae6088e456 am: 37cd5f116d am: 4c09f57e62
am: 31dcf0154d

Change-Id: Ief95861362c2ed6146c12c2b1570024dbde49269

media/libmediaplayerservice/MediaPlayerFactory.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerFactory.cpp b/media/libmediaplayerservice/MediaPlayerFactory.cpp
index 0a9f791..6da1ec1 100644
--- a/media/libmediaplayerservice/MediaPlayerFactory.cpp
+++ b/media/libmediaplayerservice/MediaPlayerFactory.cpp
@@ -245,8 +245,12 @@
     if (sInitComplete)
         return;
 
-    registerFactory_l(new NuPlayerFactory(), NU_PLAYER);
-    registerFactory_l(new TestPlayerFactory(), TEST_PLAYER);
+    IFactory* factory = new NuPlayerFactory();
+    if (registerFactory_l(factory, NU_PLAYER) != OK)
+        delete factory;
+    factory = new TestPlayerFactory();
+    if (registerFactory_l(factory, TEST_PLAYER) != OK)
+        delete factory;
 
     sInitComplete = true;
 }