commit e8c1a743ecfed21b42f671dc20d7110ea1a0a0ef
author Dongwon Kang <dwkang@google.com> Tue Mar 28 10:54:46 2017 -0700
committer gitbuildkicker <android-build@google.com> Tue Mar 28 14:31:02 2017 -0700
tree c289b010607c7564de520e427e44bf63f298df61
parent 90411658318f88932247ebf70ce34786b894a2e5

MediaSession: clear identity before accessing service methods

Test: build and manually verified the issue is fixed.
Bug: 36669550
Change-Id: I44eda4e2fb08dd9aa6972b12ed4c4e82797ff587
(cherry picked from commit 0c1d448d1de41350080e7cae05728904f0121387)

services/core/java/com/android/server/media/MediaSessionRecord.java

diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java
index 7f75c83..53a8092 100644
--- a/services/core/java/com/android/server/media/MediaSessionRecord.java
+++ b/services/core/java/com/android/server/media/MediaSessionRecord.java
@@ -772,7 +772,12 @@
     private final class SessionStub extends ISession.Stub {
         @Override
         public void destroy() {
-            mService.destroySession(MediaSessionRecord.this);
+            final long token = Binder.clearCallingIdentity();
+            try {
+                mService.destroySession(MediaSessionRecord.this);
+            } finally {
+                Binder.restoreCallingIdentity(token);
+            }
         }
 
         @Override