diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-01-28 01:42:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-28 01:42:30 +0000 |
| commit | 40a79ee900a8d6b6931f741313eec2a6d5284bac (patch) | |
| tree | 1dc549edb6e97e21ceccc7969771964389ac7c21 /framework/java/android/bluetooth/BluetoothProfileConnector.java | |
| parent | aa63bd2617a90f4d83724802b024a97e3a623709 (diff) | |
| parent | 8a9ac79f7b0f3a6387729cd1a6ae784d9d94b9de (diff) | |
Merge "re-use CURRENT_OR_SELF not CURRENT" am: 46b50d227b am: cf7c2303d9 am: 6ca88d122b am: 8a9ac79f7b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1961321
Change-Id: Idccafd6827735afc635235a9cdf2a05708bbc8d5
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothProfileConnector.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothProfileConnector.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothProfileConnector.java b/framework/java/android/bluetooth/BluetoothProfileConnector.java index a457679716..dfc35eabe8 100644 --- a/framework/java/android/bluetooth/BluetoothProfileConnector.java +++ b/framework/java/android/bluetooth/BluetoothProfileConnector.java @@ -51,6 +51,9 @@ public abstract class BluetoothProfileConnector<T> { private final String mServiceName; private volatile T mService; + // -3 match with UserHandle.USER_CURRENT_OR_SELF + private static final UserHandle USER_HANDLE_CURRENT_OR_SELF = UserHandle.of(-3); + private final IBluetoothStateChangeCallback mBluetoothStateChangeCallback = new IBluetoothStateChangeCallback.Stub() { public void onBluetoothStateChange(boolean up) { @@ -131,7 +134,7 @@ public abstract class BluetoothProfileConnector<T> { ComponentName comp = resolveSystemService(intent, mContext.getPackageManager()); intent.setComponent(comp); if (comp == null || !mContext.bindServiceAsUser(intent, mConnection, 0, - UserHandle.CURRENT)) { + USER_HANDLE_CURRENT_OR_SELF)) { logError("Could not bind to Bluetooth Service with " + intent); return false; } |