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

Commit 1d2e68cf authored by Ugo Yu's avatar Ugo Yu
Browse files

Refine Bluetooth silence mode API 

- Remove silence state extra data from ACTION_SILENCE_MODE_CHANGED
  intent
- Rename getSilenceMode -> isInSilenceMode
- Throw IllegalStateException if Bluetooth is not enabled

Bug: 124448652
Test: runtest bluetooth

Change-Id: I6a8d8d848249faaac34e87408dcf750073b03584
parent 41995621

api/system-current.txt

+1 −2
Original line number Diff line number Diff line
@@ -745,9 +745,9 @@ package android.bluetooth { 
  public final class BluetoothDevice implements android.os.Parcelable {

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN) public boolean cancelBondProcess();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public String getMetadata(int);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean getSilenceMode();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public boolean isConnected();

    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_PRIVILEGED) public boolean setMetadata(int, String);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setPhonebookAccessPermission(int);
@@ -756,7 +756,6 @@ package android.bluetooth { 
    field public static final int ACCESS_REJECTED = 2; // 0x2

    field public static final int ACCESS_UNKNOWN = 0; // 0x0

    field public static final String ACTION_SILENCE_MODE_CHANGED = "android.bluetooth.device.action.SILENCE_MODE_CHANGED";

    field public static final String EXTRA_SILENCE_ENABLED = "android.bluetooth.device.extra.SILENCE_ENABLED";

    field public static final int METADATA_COMPANION_APP = 4; // 0x4

    field public static final int METADATA_ENHANCED_SETTINGS_UI_URI = 16; // 0x10

    field public static final int METADATA_HARDWARE_VERSION = 3; // 0x3

core/java/android/bluetooth/BluetoothDevice.java

+9 −20
Original line number Diff line number Diff line
@@ -535,7 +535,6 @@ public final class BluetoothDevice implements Parcelable { 
    /**

     * Intent to broadcast silence mode changed.

     * Alway contains the extra field {@link #EXTRA_DEVICE}

     * Alway contains the extra field {@link #EXTRA_SILENCE_ENABLED}

     *

     * @hide

     */
@@ -544,16 +543,6 @@ public final class BluetoothDevice implements Parcelable { 
    public static final String ACTION_SILENCE_MODE_CHANGED =

            "android.bluetooth.device.action.SILENCE_MODE_CHANGED";



    /**

     * Used as an extra field in {@link #ACTION_SILENCE_MODE_CHANGED} intent,

     * contains whether device is in silence mode as boolean.

     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_SILENCE_ENABLED =

            "android.bluetooth.device.extra.SILENCE_ENABLED";



    /**

     * Used as an extra field in {@link #ACTION_CONNECTION_ACCESS_REQUEST} intent.

     *
@@ -1615,7 +1604,8 @@ public final class BluetoothDevice implements Parcelable { 
    }



    /**

     * Set the Bluetooth device silence mode.

     * Sets whether the {@link BluetoothDevice} enters silence mode. Audio will not

     * be routed to the {@link BluetoothDevice} if set to {@code true}.

     *

     * When the {@link BluetoothDevice} enters silence mode, and the {@link BluetoothDevice}

     * is an active device (for A2DP or HFP), the active device for that profile
@@ -1635,6 +1625,7 @@ public final class BluetoothDevice implements Parcelable { 
     *

     * @param silence true to enter silence mode, false to exit

     * @return true on success, false on error.

     * @throws IllegalStateException if Bluetooth is not turned ON.

     * @hide

     */

    @SystemApi
@@ -1642,12 +1633,9 @@ public final class BluetoothDevice implements Parcelable { 
    public boolean setSilenceMode(boolean silence) {

        final IBluetooth service = sService;

        if (service == null) {

            return false;

            throw new IllegalStateException("Bluetooth is not turned ON");

        }

        try {

            if (getSilenceMode() == silence) {

                return true;

            }

            return service.setSilenceMode(this, silence);

        } catch (RemoteException e) {

            Log.e(TAG, "setSilenceMode fail", e);
@@ -1656,24 +1644,25 @@ public final class BluetoothDevice implements Parcelable { 
    }



    /**

     * Get the device silence mode status

     * Check whether the {@link BluetoothDevice} is in silence mode

     *

     * <p> Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED}.

     *

     * @return true on device in silence mode, otherwise false.

     * @throws IllegalStateException if Bluetooth is not turned ON.

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    public boolean getSilenceMode() {

    public boolean isInSilenceMode() {

        final IBluetooth service = sService;

        if (service == null) {

            return false;

            throw new IllegalStateException("Bluetooth is not turned ON");

        }

        try {

            return service.getSilenceMode(this);

        } catch (RemoteException e) {

            Log.e(TAG, "getSilenceMode fail", e);

            Log.e(TAG, "isInSilenceMode fail", e);

            return false;

        }

    }