diff options
| author | Eric Laurent <elaurent@google.com> | 2014-12-19 17:28:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-19 17:28:03 +0000 |
| commit | b4185370d22457e8893ab5da07870e6d56910fbe (patch) | |
| tree | f989bbad90b17ce2d214549f647168736e8842d0 /media | |
| parent | 9079259054359e45b9616afaa799439c9171c0e2 (diff) | |
| parent | 05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3 (diff) | |
| download | frameworks_base-b4185370d22457e8893ab5da07870e6d56910fbe.zip frameworks_base-b4185370d22457e8893ab5da07870e6d56910fbe.tar.gz frameworks_base-b4185370d22457e8893ab5da07870e6d56910fbe.tar.bz2 | |
am 05fce092: am 8d24fe23: Merge "AudioService: fix permission check." into lmp-mr1-dev
* commit '05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3':
AudioService: fix permission check.
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioService.java | 3 |
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); } |