Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" am:...

Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" am: ecda1316 am: 80df4cc0

Change-Id: I98a1fa9a058cc9cadc573a584c5161110ee091af

parents 271161a7 80df4cc0

framework/java/android/bluetooth/BluetoothDevice.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {