Merge "Check bluetooth app id instead of uid" into oc-dev

am: 094996a2b3 Change-Id: I21b9c07bef34974601abd27045481bc45cf882b5
2017-04-24 19:35:08 +00:00
parent 19bdb91fb7 094996a2b3
commit 3a3fdfa53b
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -965,7 +965,7 @@ public class MediaSessionService extends SystemService implements Monitor {
            final int uid = Binder.getCallingUid();
            final long token = Binder.clearCallingIdentity();
            try {
-                if (uid != Process.BLUETOOTH_UID) {
+                if (!UserHandle.isSameApp(uid, Process.BLUETOOTH_UID)) {
                    throw new SecurityException("Only Bluetooth service processes can set"
                            + " Callback");
                }