Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaSessionService: Clear calling identity for incoming calls from apps" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-20 03:08:21 +00:00
committed by Android (Google) Code Review
parent 949b512761 83c4635e12
commit 2891f34ea9
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/media/MediaSessionRecord.java
View File

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