commit 7d4a354fd572ac0dc01f9b815a9e0af2d127bc5b
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 24 23:30:51 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 24 23:30:53 2017 +0000
tree b106521156cccd15c26f69695fa1ade08cf9a257
parent f02b7b7ba6a712a0803877907b8d4ed30ace169d
parent 4136b1d0aa02e51df990bdeb11c93d6def1b0c54

Merge "Check Bluetooth app id instead of uid"

services/core/java/com/android/server/media/MediaSessionService.java

diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index cc41060..f97a672 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -866,7 +866,7 @@
             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");
                 }