diff options
| author | Eric Laurent <elaurent@google.com> | 2014-12-19 17:31:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-19 17:31:14 +0000 |
| commit | ddac2a7b3157efaf3d1afcd2c3e3cc5699e7585f (patch) | |
| tree | 25ef2f8f0f1d8d83e1adab7bcaf4446d7b3c7402 | |
| parent | 2d412c369f060a914da167f0cffa2d275cfbccee (diff) | |
| parent | b4185370d22457e8893ab5da07870e6d56910fbe (diff) | |
| download | frameworks_base-ddac2a7b3157efaf3d1afcd2c3e3cc5699e7585f.zip frameworks_base-ddac2a7b3157efaf3d1afcd2c3e3cc5699e7585f.tar.gz frameworks_base-ddac2a7b3157efaf3d1afcd2c3e3cc5699e7585f.tar.bz2 | |
am 05fce092: am 8d24fe23: Merge "AudioService: fix permission check." into lmp-mr1-dev
automerge: b418537
* commit 'b4185370d22457e8893ab5da07870e6d56910fbe':
AudioService: fix permission check.
| -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 c04a7f0..43629c0 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); } |