From d23ab35c01b0cb138d1d8514ce87f438e47feca1 Mon Sep 17 00:00:00 2001 From: William Escande Date: Wed, 24 Nov 2021 20:13:18 +0100 Subject: [PATCH] replace CURRENT_OR_SELF with non hidden API This API is called by a mainline module (Bluetooth), and needs to be change to an available API. Bug: 200200870 Tag: #refactor Test: Build + start bt + switch user and restart bt Change-Id: I37bb0d16e61d666d0aa51d5efe48fa9b39f9c1c3 --- core/java/android/bluetooth/BluetoothPbap.java | 3 +-- core/java/android/bluetooth/BluetoothProfileConnector.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/java/android/bluetooth/BluetoothPbap.java b/core/java/android/bluetooth/BluetoothPbap.java index c000e56e7b04e..8ee38d3e1260a 100644 --- a/core/java/android/bluetooth/BluetoothPbap.java +++ b/core/java/android/bluetooth/BluetoothPbap.java @@ -23,7 +23,6 @@ import android.annotation.SdkConstant; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.bluetooth.annotations.RequiresBluetoothConnectPermission; -import android.bluetooth.annotations.RequiresLegacyBluetoothPermission; import android.compat.annotation.UnsupportedAppUsage; import android.content.Attributable; import android.content.AttributionSource; @@ -170,7 +169,7 @@ public class BluetoothPbap implements BluetoothProfile { mContext.getPackageManager(), 0); intent.setComponent(comp); if (comp == null || !mContext.bindServiceAsUser(intent, mConnection, 0, - UserHandle.CURRENT_OR_SELF)) { + UserHandle.CURRENT)) { Log.e(TAG, "Could not bind to Bluetooth Pbap Service with " + intent); return false; } diff --git a/core/java/android/bluetooth/BluetoothProfileConnector.java b/core/java/android/bluetooth/BluetoothProfileConnector.java index a254291f57dbc..ecd5e4077de9f 100644 --- a/core/java/android/bluetooth/BluetoothProfileConnector.java +++ b/core/java/android/bluetooth/BluetoothProfileConnector.java @@ -103,7 +103,7 @@ public abstract class BluetoothProfileConnector { mContext.getPackageManager(), 0); intent.setComponent(comp); if (comp == null || !mContext.bindServiceAsUser(intent, mConnection, 0, - UserHandle.CURRENT_OR_SELF)) { + UserHandle.CURRENT)) { logError("Could not bind to Bluetooth Service with " + intent); return false; }