summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-12-19 17:19:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-19 17:19:34 +0000
commit05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3 (patch)
tree9bad1175100a49eb43ca7638ef74dcbe250de866
parent87343eff543a127c29e0fa47c9c276b3e9b92d57 (diff)
parent8d24fe235a6e8f44e32a56a05ab36ed5b35385df (diff)
downloadframeworks_base-05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3.zip
frameworks_base-05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3.tar.gz
frameworks_base-05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3.tar.bz2
am 8d24fe23: Merge "AudioService: fix permission check." into lmp-mr1-dev
* commit '8d24fe235a6e8f44e32a56a05ab36ed5b35385df': AudioService: fix permission check.
-rw-r--r--media/java/android/media/AudioService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index 8a543ce..1c10422 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -3248,7 +3248,10 @@ public class AudioService extends IAudioService.Stub {
TelecomManager telecomManager =
(TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE);
+
+ final long ident = Binder.clearCallingIdentity();
IsInCall = telecomManager.isInCall();
+ Binder.restoreCallingIdentity(ident);
return (IsInCall || getMode() == AudioManager.MODE_IN_COMMUNICATION);
}