diff options
| author | 2020-02-02 00:02:43 +0000 | |
|---|---|---|
| committer | 2020-02-02 00:02:43 +0000 | |
| commit | e2deab502fce36fc843553889c90c5b68ccf7806 (patch) | |
| tree | dbcd3140855e89edf280908e7e4485c5332ccef1 | |
| parent | 4104f77d64866869295c6f6af659e07548ba11e5 (diff) | |
| parent | 8eebd377ae9e03d4a1893967c2a4fc3add22bd75 (diff) | |
Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" am: 7a028c7f5b am: bbfcf7fc56 am: 8eebd377ae
Change-Id: I61d78666262095cd22f3fdef7bcc50e281ddc2a0
| -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 c8f9e2a51426..daad70339866 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1557,7 +1557,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 1872ae03ee97..5b60b85f4721 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) { |