Merge "MediaSessionService: Clear calling identity for incoming calls from apps" into oc-dev (84589843) · Commits · e / os / android_frameworks_base

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

+18 −3

Original line number	Diff line number	Diff line
		@@ -751,7 +751,12 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
		@Override
		public void setActive(boolean active) {
		mIsActive = active;
		final long token = Binder.clearCallingIdentity();
		try {
		mService.updateSession(MediaSessionRecord.this);
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		mHandler.post(MessageHandler.MSG_UPDATE_SESSION_STATE);
		}

		@@ -862,7 +867,12 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
		}
		}
		if (typeChanged) {
		final long token = Binder.clearCallingIdentity();
		try {
		mService.onSessionPlaybackTypeChanged(MediaSessionRecord.this);
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		mHandler.post(MessageHandler.MSG_UPDATE_VOLUME);
		}
		}
		@@ -877,7 +887,12 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
		mMaxVolume = max;
		}
		if (typeChanged) {
		final long token = Binder.clearCallingIdentity();
		try {
		mService.onSessionPlaybackTypeChanged(MediaSessionRecord.this);
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		mHandler.post(MessageHandler.MSG_UPDATE_VOLUME);
		}
		}