Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2deab50 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" am: 7a028c7f am: bbfcf7fc am: 8eebd377

Change-Id: I61d78666262095cd22f3fdef7bcc50e281ddc2a0
parents 4104f77d 8eebd377

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/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) {