commit ffb6f109a3b3e5421e2ca0298423ee566122ed66
author Cheney Ni <cheneyni@google.com> Wed Aug 22 07:10:40 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 22 07:10:40 2018 -0700
tree 11317d337251f20a3594fd580049648cd1d9f063
parent 93e37437ae5326e718538bf63328641e6c2d82bc
parent 280efb289bec04303efe1e810fb239629646b527

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

Change-Id: I5e8ce0749a8b1e787e8ee3db90399d304d090e76

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;
         }