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

Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jinsuk Kim
2014-12-13 23:41:46 +00:00
committed by Android (Google) Code Review
parent 90c0ae637a 48cbf292ba
commit a2bc055eeb
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
media/java/android/media/AudioService.java
View File

@@ -1159,8 +1159,13 @@ public class AudioService extends IAudioService.Stub {
synchronized (mHdmiManager) { synchronized (mHdmiManager) {
if (!mHdmiSystemAudioSupported) return; if (!mHdmiSystemAudioSupported) return;
synchronized (mHdmiTvClient) { synchronized (mHdmiTvClient) {
mHdmiTvClient.setSystemAudioVolume( final long token = Binder.clearCallingIdentity();
(oldVolume + 5) / 10, (newVolume + 5) / 10, maxVolume); try {
mHdmiTvClient.setSystemAudioVolume(
(oldVolume + 5) / 10, (newVolume + 5) / 10, maxVolume);
} finally {
Binder.restoreCallingIdentity(token);
}
} }
} }
} }
@@ -1538,15 +1543,14 @@ public class AudioService extends IAudioService.Stub {
private void setSystemAudioMute(boolean state) { private void setSystemAudioMute(boolean state) {
if (mHdmiManager == null || mHdmiTvClient == null) return; if (mHdmiManager == null || mHdmiTvClient == null) return;
synchronized (mHdmiManager) { synchronized (mHdmiManager) {
final long token = Binder.clearCallingIdentity(); if (!mHdmiSystemAudioSupported) return;
try { synchronized (mHdmiTvClient) {
synchronized (mHdmiTvClient) { final long token = Binder.clearCallingIdentity();
if (mHdmiSystemAudioSupported) { try {
mHdmiTvClient.setSystemAudioMute(state); mHdmiTvClient.setSystemAudioMute(state);
} } finally {
Binder.restoreCallingIdentity(token);
} }
} finally {
Binder.restoreCallingIdentity(token);
} }
} }
} }