am 0bc0f109: Merge "audioservice: always acquire wake lock as AudioService" into klp-dev

* commit '0bc0f109dfe935a4ede91862d1f556e7f03a8bf2':
  audioservice: always acquire wake lock as AudioService

1 files changed, 4 insertions, 0 deletions

diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index 3425c91aac07..84ea4c90d62b 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -2687,7 +2687,11 @@ public class AudioService extends IAudioService.Stub {
      */
     private void queueMsgUnderWakeLock(Handler handler, int msg,
             int arg1, int arg2, Object obj, int delay) {
+        final long ident = Binder.clearCallingIdentity();
+        // Always acquire the wake lock as AudioService because it is released by the
+        // message handler.
         mAudioEventWakeLock.acquire();
+        Binder.restoreCallingIdentity(ident);
         sendMsg(handler, msg, SENDMSG_QUEUE, arg1, arg2, obj, delay);
     }