diff options
| author | 2020-02-01 23:41:15 +0000 | |
|---|---|---|
| committer | 2020-02-01 23:41:15 +0000 | |
| commit | bbfcf7fc56e2b8143d503c63c122bd8944a50059 (patch) | |
| tree | dc4b27d5a26b19ce3879e464d65b352b8e840baf | |
| parent | 44d8a611c4bc6253706ddb660ff335aca9d4dc67 (diff) | |
| parent | 7a028c7f5b5c670c3e1f507604e799d20a10b599 (diff) | |
Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" am: 7a028c7f5b
Change-Id: I363ded95542c1402b6828d5475e04d2554c8d01e
| -rwxr-xr-x | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index d95ee3008411..b3dea03772d7 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1377,7 +1377,7 @@ package android.bluetooth { method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public boolean isEncrypted(); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean isInSilenceMode(); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean removeBond(); - method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public boolean setAlias(@NonNull String); + method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setAlias(@NonNull String); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setMessageAccessPermission(int); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setMetadata(int, @NonNull byte[]); method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setPhonebookAccessPermission(int); diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 8e4deb2051df..12eee73f5f0f 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -1093,7 +1093,7 @@ public final class BluetoothDevice implements Parcelable { * @hide */ @SystemApi - @RequiresPermission(Manifest.permission.BLUETOOTH) + @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setAlias(@NonNull String alias) { final IBluetooth service = sService; if (service == null) { |