commit da28fa37e82ee34b8adda0cb1c9b79e78a3fc72b
author Cheney Ni <cheneyni@google.com> Wed Aug 22 08:01:31 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 22 08:01:31 2018 -0700
tree 5cc01d7ee8ddeabede541bba8304af1ab7a01f18
parent 84862e2f012b3ab08cbf8015b298690d55c91599
parent ffb6f109a3b3e5421e2ca0298423ee566122ed66

Merge "Be the current user to get A2DP proxy" am: c3824e5d57 am: 280efb289b
am: ffb6f109a3

Change-Id: Ia4ecd35123fe0964b80482e072e327748bbc2fe1

core/java/android/bluetooth/BluetoothA2dp.java

diff --git a/core/java/android/bluetooth/BluetoothA2dp.java b/core/java/android/bluetooth/BluetoothA2dp.java
index 966f902..d21f76d 100644
--- a/core/java/android/bluetooth/BluetoothA2dp.java
+++ b/core/java/android/bluetooth/BluetoothA2dp.java
@@ -30,6 +30,7 @@
 import android.os.IBinder;
 import android.os.ParcelUuid;
 import android.os.RemoteException;
+import android.os.UserHandle;
 import android.util.Log;
 
 import com.android.internal.annotations.GuardedBy;
@@ -270,7 +271,7 @@
         ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);
         intent.setComponent(comp);
         if (comp == null || !mContext.bindServiceAsUser(intent, mConnection, 0,
-                mContext.getUser())) {
+                UserHandle.CURRENT_OR_SELF)) {
             Log.e(TAG, "Could not bind to Bluetooth A2DP Service with " + intent);
             return false;
         }