summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2013-03-28 23:28:02 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-03-28 23:28:02 +0000
commitdac3fd9d90daffb4f6b08c788184ff38523348ba (patch)
tree27a7670a9e4dd4abb5800ae766ee6bbed7812465
parentaf7c60be4d18381bfd70b079f1c57480b0c3aea8 (diff)
parent6b5e22d52c69cb6d80ff09bd32395b0034ada343 (diff)
Merge "audio service: fix BT SCO intent permission again" into jb-mr2-dev
-rw-r--r--media/java/android/media/AudioService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index 38cdb8a71a8e..cf48cdbdeca3 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -1533,7 +1533,9 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
// when entering RINGTONE, IN_CALL or IN_COMMUNICATION mode, clear all
// SCO connections not started by the application changing the mode
if (newModeOwnerPid != 0) {
- disconnectBluetoothSco(newModeOwnerPid);
+ final long ident = Binder.clearCallingIdentity();
+ disconnectBluetoothSco(newModeOwnerPid);
+ Binder.restoreCallingIdentity(ident);
}
}