diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-01-27 11:38:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-27 11:38:05 +0000 |
| commit | 533812c66a88eafd7430b2584bc9cc71520ab679 (patch) | |
| tree | b514f7b348374e9b0033b585069f7b5b867eadf0 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 363c8bb1f5906db2ba94939bcd9a306c689e86bb (diff) | |
| parent | 570df21f56f2c8b4f6c3b438e8c9ecd41c42932f (diff) | |
Merge changes from topic "mig" am: 7e8af675eb am: 2dd3ce73ee am: 570df21f56
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1952559
Change-Id: I6aaa1c076fe848ee2939ab7d44f175c1360d002b
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index 3432551b1e..34c3160790 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -2571,14 +2571,20 @@ public final class BluetoothAdapter { * BluetoothProfile}. * @hide */ - @RequiresNoPermission + @SystemApi + @RequiresBluetoothConnectPermission + @RequiresPermission(allOf = { + android.Manifest.permission.BLUETOOTH_CONNECT, + android.Manifest.permission.BLUETOOTH_PRIVILEGED, + }) public @NonNull List<Integer> getSupportedProfiles() { final ArrayList<Integer> supportedProfiles = new ArrayList<Integer>(); try { synchronized (mManagerCallback) { if (mService != null) { - final long supportedProfilesBitMask = mService.getSupportedProfiles(); + final long supportedProfilesBitMask = + mService.getSupportedProfiles(mAttributionSource); for (int i = 0; i <= BluetoothProfile.MAX_PROFILE_ID; i++) { if ((supportedProfilesBitMask & (1 << i)) != 0) { @@ -2594,6 +2600,7 @@ public final class BluetoothAdapter { } } catch (RemoteException e) { Log.e(TAG, "getSupportedProfiles:", e); + e.rethrowFromSystemServer(); } return supportedProfiles; } |