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 am: 2891f34ea9

Browse Source 
am: 84589843d1

Change-Id: I19179969664e6e9f9c147a5886b512617f0f5afa
This commit is contained in:
Jaewan Kim
2017-04-20 15:14:26 +00:00
committed by android-build-merger
parent 9a3943449c 84589843d1
commit 01485a1d5c
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
public void setActive(boolean 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);
}
@@ -862,7 +867,12 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
}
}
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);
}
}
@@ -877,7 +887,12 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {
mMaxVolume = max;
}
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);
}
}