From 4136b1d0aa02e51df990bdeb11c93d6def1b0c54 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Mon, 24 Apr 2017 11:30:19 -0700
Subject: [PATCH] Check Bluetooth app id instead of uid

Fixes the crash on user switches.

Change-Id: If0c003011bd014b437ef5c8bee24a27b68be88d9
Fixes: 37617840
Test: manual - add a user
---
 .../core/java/com/android/server/media/MediaSessionService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index cc41060a55eb4..f97a672b6d406 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 @@ 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");
                 }