commit b4185370d22457e8893ab5da07870e6d56910fbe
author Eric Laurent <elaurent@google.com> Fri Dec 19 17:28:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 19 17:28:03 2014 +0000
tree f989bbad90b17ce2d214549f647168736e8842d0
parent 9079259054359e45b9616afaa799439c9171c0e2
parent 05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3

am 05fce092: am 8d24fe23: Merge "AudioService: fix permission check." into lmp-mr1-dev

* commit '05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3':
  AudioService: fix permission check.

media/java/android/media/AudioService.java

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 @@
 
         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);
     }