commit 31dcf0154d4ba4650915987b666a6cea0048339d
author Yunlian Jiang <yunlian@google.com> Wed Jul 12 00:08:48 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 12 00:08:48 2017 +0000
tree 07982efd6b01b2fdfb3b346f506a56ef1a8fbfc2
parent 9f2b9d3a001834c1e1990ac8e2a8717ad38c7eee
parent 4c09f57e628bcbdf04f976d83c4fa424c5035e5d

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

Change-Id: Ie864652e4f5344d50e68ede6aa23b021b1ee84c1

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;
 }