diff options
author | Jinsuk Kim <jinsukkim@google.com> | 2014-12-13 23:41:46 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-13 23:41:48 +0000 |
commit | a2bc055eeb240c1787e7ad9755ffd4f106bdbb63 (patch) | |
tree | 983dca03e849b492d637d123410322ac76bdbe6e | |
parent | 90c0ae637ab84d1954ce972f55c5d3e2d2b20586 (diff) | |
parent | 48cbf292ba9ad550af7e44d950a441b1812428e2 (diff) | |
download | frameworks_base-a2bc055eeb240c1787e7ad9755ffd4f106bdbb63.zip frameworks_base-a2bc055eeb240c1787e7ad9755ffd4f106bdbb63.tar.gz frameworks_base-a2bc055eeb240c1787e7ad9755ffd4f106bdbb63.tar.bz2 |
Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev
-rw-r--r-- | media/java/android/media/AudioService.java | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index ea9e703..f0150d4 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -1159,8 +1159,13 @@ public class AudioService extends IAudioService.Stub { synchronized (mHdmiManager) { if (!mHdmiSystemAudioSupported) return; synchronized (mHdmiTvClient) { - mHdmiTvClient.setSystemAudioVolume( - (oldVolume + 5) / 10, (newVolume + 5) / 10, maxVolume); + final long token = Binder.clearCallingIdentity(); + 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) { if (mHdmiManager == null || mHdmiTvClient == null) return; synchronized (mHdmiManager) { - final long token = Binder.clearCallingIdentity(); - try { - synchronized (mHdmiTvClient) { - if (mHdmiSystemAudioSupported) { - mHdmiTvClient.setSystemAudioMute(state); - } + if (!mHdmiSystemAudioSupported) return; + synchronized (mHdmiTvClient) { + final long token = Binder.clearCallingIdentity(); + try { + mHdmiTvClient.setSystemAudioMute(state); + } finally { + Binder.restoreCallingIdentity(token); } - } finally { - Binder.restoreCallingIdentity(token); } } } |