commit 11f88677e9a9405d2b5d7f7bf9b6eec035b6331d
author Chong Zhang <chz@google.com> Fri Apr 24 17:45:25 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 24 17:45:26 2015 +0000
tree d9e0dd64d6b604dd4a805ee4054c143c017ad565
parent bb6635d0aa35d6d31ec7de7c0d957720983fdc55
parent 45c765da4d67088ea7ce0fab438300682c3914f0

Merge "MediaCodec: ignore error when linkToDeath to batterystats"

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 93864e4..96b22c0 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -139,12 +139,7 @@
             return NULL;
         }
         mDeathNotifier = new DeathNotifier();
-        if (IInterface::asBinder(mBatteryStatService)->
-                linkToDeath(mDeathNotifier) != OK) {
-            mBatteryStatService.clear();
-            mDeathNotifier.clear();
-            return NULL;
-        }
+        IInterface::asBinder(mBatteryStatService)->linkToDeath(mDeathNotifier);
         // notify start now if media already started
         if (mVideoRefCount > 0) {
             mBatteryStatService->noteStartVideo(AID_MEDIA);
@@ -179,8 +174,9 @@
         return;
     }
 
-    mVideoRefCount--;
     sp<IBatteryStats> batteryService = getBatteryService_l();
+
+    mVideoRefCount--;
     if (mVideoRefCount == 0 && batteryService != NULL) {
         batteryService->noteStopVideo(AID_MEDIA);
     }
@@ -202,8 +198,9 @@
         return;
     }
 
-    mAudioRefCount--;
     sp<IBatteryStats> batteryService = getBatteryService_l();
+
+    mAudioRefCount--;
     if (mAudioRefCount == 0 && batteryService != NULL) {
         batteryService->noteStopAudio(AID_MEDIA);
     }