diff options
| author | William Escande <wescande@google.com> | 2021-11-24 20:13:18 +0100 |
|---|---|---|
| committer | William Escande <wescande@google.com> | 2021-11-30 13:18:29 +0000 |
| commit | 697eeaf6d09232d3a06f7c5e67461d35c67a2e92 (patch) | |
| tree | 4afe3d82542887e4625993511e8bb9a0dd27828a | |
| parent | d0e4f63440c9055300544f3eb958af94b0f6d9bf (diff) | |
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
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothPbap.java | 3 | ||||
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothProfileConnector.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/framework/java/android/bluetooth/BluetoothPbap.java b/framework/java/android/bluetooth/BluetoothPbap.java index c000e56e7b..8ee38d3e12 100644 --- a/framework/java/android/bluetooth/BluetoothPbap.java +++ b/framework/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/framework/java/android/bluetooth/BluetoothProfileConnector.java b/framework/java/android/bluetooth/BluetoothProfileConnector.java index a254291f57..ecd5e4077d 100644 --- a/framework/java/android/bluetooth/BluetoothProfileConnector.java +++ b/framework/java/android/bluetooth/BluetoothProfileConnector.java @@ -103,7 +103,7 @@ public abstract class BluetoothProfileConnector<T> { 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; } |