commit 0bfa3eee31c9f99ec65158f810e65e12bae5ebf1
author Andy Hung <hunga@google.com> Fri May 13 15:48:36 2016 -0700
committer Andy Hung <hunga@google.com> Mon May 16 10:54:26 2016 -0700
tree cf5719e6a3cec8c447a053bd6a456556b86efefc
parent e35bcaa2c908c5ef404928412ade7711e6173d35

MediaPlayer/MediaRecorder: Do not notify client of audioserver death

Handled internally within NuPlayer and MediaRecorder.

Bug: 28768023
Change-Id: I26d94332a4668bf7a8ad54a7b25e6f0a3a6fe48d

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index cd91e72..f0190c4 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -682,10 +682,6 @@
     mCodecDeathListener = new ServiceDeathNotifier(binder, p, MEDIACODEC_PROCESS_DEATH);
     binder->linkToDeath(mCodecDeathListener);
 
-    binder = sm->getService(String16("media.audio_flinger"));
-    mAudioDeathListener = new ServiceDeathNotifier(binder, p, AUDIO_PROCESS_DEATH);
-    binder->linkToDeath(mAudioDeathListener);
-
     if (!p->hardwareOutput()) {
         Mutex::Autolock l(mLock);
         mAudioOutput = new AudioOutput(mAudioSessionId, IPCThreadState::self()->getCallingUid(),

media/libmediaplayerservice/MediaPlayerService.h

diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h
index 0ecfdbc..01977f5 100644
--- a/media/libmediaplayerservice/MediaPlayerService.h
+++ b/media/libmediaplayerservice/MediaPlayerService.h
@@ -231,7 +231,7 @@
         MEDIASERVER_PROCESS_DEATH = 0,
         MEDIAEXTRACTOR_PROCESS_DEATH = 1,
         MEDIACODEC_PROCESS_DEATH = 2,
-        AUDIO_PROCESS_DEATH = 3,
+        AUDIO_PROCESS_DEATH = 3,   // currently no need to track this
         CAMERA_PROCESS_DEATH = 4
     };
 
@@ -419,7 +419,6 @@
 
         sp<IBinder::DeathRecipient> mExtractorDeathListener;
         sp<IBinder::DeathRecipient> mCodecDeathListener;
-        sp<IBinder::DeathRecipient> mAudioDeathListener;
 #if CALLBACK_ANTAGONIZER
                     Antagonizer*                mAntagonizer;
 #endif

media/libmediaplayerservice/MediaRecorderClient.cpp

diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp
index 2832166..d011d70 100644
--- a/media/libmediaplayerservice/MediaRecorderClient.cpp
+++ b/media/libmediaplayerservice/MediaRecorderClient.cpp
@@ -378,11 +378,6 @@
             MediaPlayerService::MEDIACODEC_PROCESS_DEATH);
     binder->linkToDeath(mCodecDeathListener);
 
-    binder = sm->getService(String16("media.audio_flinger"));
-    mAudioDeathListener = new ServiceDeathNotifier(binder, listener,
-            MediaPlayerService::AUDIO_PROCESS_DEATH);
-    binder->linkToDeath(mAudioDeathListener);
-
     return OK;
 }
 

media/libmediaplayerservice/MediaRecorderClient.h

diff --git a/media/libmediaplayerservice/MediaRecorderClient.h b/media/libmediaplayerservice/MediaRecorderClient.h
index 6e70194..eceb653 100644
--- a/media/libmediaplayerservice/MediaRecorderClient.h
+++ b/media/libmediaplayerservice/MediaRecorderClient.h
@@ -87,7 +87,6 @@
 
     sp<IBinder::DeathRecipient> mCameraDeathListener;
     sp<IBinder::DeathRecipient> mCodecDeathListener;
-    sp<IBinder::DeathRecipient> mAudioDeathListener;
 
     pid_t                  mPid;
     Mutex                  mLock;