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

Commit 6a44bb9e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add error code for BluetoothDevice#getBatteryLevel to represent... 

Merge "Add error code for BluetoothDevice#getBatteryLevel to represent Bluetooth is off" into rvc-dev am: 23ad582c am: 563bac24

Change-Id: I23734886ccaaf8b5066a754c4c357eaea25f12a2
parents 5a4415f1 563bac24

core/java/android/bluetooth/BluetoothDevice.java

+17 −7
Original line number Diff line number Diff line
@@ -230,6 +230,13 @@ public final class BluetoothDevice implements Parcelable { 
     */

    public static final int BATTERY_LEVEL_UNKNOWN = -1;



    /**

     * Used as an error value for {@link #getBatteryLevel()} to represent bluetooth is off

     *

     * @hide

     */

    public static final int BATTERY_LEVEL_BLUETOOTH_OFF = -100;



    /**

     * Used as a Parcelable {@link BluetoothDevice} extra field in every intent

     * broadcast by this class. It contains the {@link BluetoothDevice} that
@@ -1112,9 +1119,9 @@ public final class BluetoothDevice implements Parcelable { 
    /**

     * Get the most recent identified battery level of this Bluetooth device

     *

     * @return Battery level in percents from 0 to 100, or {@link #BATTERY_LEVEL_UNKNOWN} if

     * Bluetooth is disabled, or device is disconnected, or does not have any battery reporting

     * service, or return value is invalid

     * @return Battery level in percents from 0 to 100, {@link #BATTERY_LEVEL_BLUETOOTH_OFF} if

     * Bluetooth is disabled or {@link #BATTERY_LEVEL_UNKNOWN} if device is disconnected, or does

     * not have any battery reporting service, or return value is invalid

     * @hide

     */

    @SystemApi
@@ -1123,7 +1130,7 @@ public final class BluetoothDevice implements Parcelable { 
        final IBluetooth service = sService;

        if (service == null) {

            Log.e(TAG, "Bluetooth disabled. Cannot get remote device battery level");

            return BATTERY_LEVEL_UNKNOWN;

            return BATTERY_LEVEL_BLUETOOTH_OFF;

        }

        try {

            return service.getBatteryLevel(this);
@@ -1727,7 +1734,9 @@ public final class BluetoothDevice implements Parcelable { 
    /**

     * Sets whether the message access is allowed to this device.

     *

     * @param value is the value we are setting the message access permission to

     * @param value Can be {@link #ACCESS_UNKNOWN} if the device is unbonded,

     * {@link #ACCESS_ALLOWED} if the permission is being granted, or {@link #ACCESS_REJECTED} if

     * the permission is not being granted.

     * @return Whether the value has been successfully set.

     * @hide

     */
@@ -1774,8 +1783,9 @@ public final class BluetoothDevice implements Parcelable { 
    /**

     * Sets whether the Sim access is allowed to this device.

     *

     * @param value Can be {@link #ACCESS_UNKNOWN}, {@link #ACCESS_ALLOWED} or {@link

     * #ACCESS_REJECTED}.

     * @param value Can be {@link #ACCESS_UNKNOWN} if the device is unbonded,

     * {@link #ACCESS_ALLOWED} if the permission is being granted, or {@link #ACCESS_REJECTED} if

     * the permission is not being granted.

     * @return Whether the value has been successfully set.

     * @hide

     */

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+13 −11
Original line number Diff line number Diff line
@@ -494,7 +494,9 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 


    /**

     * Get battery level from remote device

     * @return battery level in percentage [0-100], or {@link BluetoothDevice#BATTERY_LEVEL_UNKNOWN}

     * @return battery level in percentage [0-100],

     * {@link BluetoothDevice#BATTERY_LEVEL_BLUETOOTH_OFF}, or

     * {@link BluetoothDevice#BATTERY_LEVEL_UNKNOWN}

     */

    public int getBatteryLevel() {

        return mDevice.getBatteryLevel();
@@ -937,12 +939,12 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        }



        String batteryLevelPercentageString = null;

        // Android framework should only set mBatteryLevel to valid range [0-100] or

        // BluetoothDevice.BATTERY_LEVEL_UNKNOWN, any other value should be a framework bug.

        // Thus assume here that if value is not BluetoothDevice.BATTERY_LEVEL_UNKNOWN, it must

        // be valid

        // Android framework should only set mBatteryLevel to valid range [0-100],

        // BluetoothDevice.BATTERY_LEVEL_BLUETOOTH_OFF, or BluetoothDevice.BATTERY_LEVEL_UNKNOWN,

        // any other value should be a framework bug. Thus assume here that if value is greater

        // than BluetoothDevice.BATTERY_LEVEL_UNKNOWN, it must be valid

        final int batteryLevel = getBatteryLevel();

        if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {

        if (batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {

            // TODO: name com.android.settingslib.bluetooth.Utils something different

            batteryLevelPercentageString =

                    com.android.settingslib.Utils.formatPercentage(batteryLevel);
@@ -1050,12 +1052,12 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        }



        String batteryLevelPercentageString = null;

        // Android framework should only set mBatteryLevel to valid range [0-100] or

        // BluetoothDevice.BATTERY_LEVEL_UNKNOWN, any other value should be a framework bug.

        // Thus assume here that if value is not BluetoothDevice.BATTERY_LEVEL_UNKNOWN, it must

        // be valid

        // Android framework should only set mBatteryLevel to valid range [0-100],

        // BluetoothDevice.BATTERY_LEVEL_BLUETOOTH_OFF, or BluetoothDevice.BATTERY_LEVEL_UNKNOWN,

        // any other value should be a framework bug. Thus assume here that if value is greater

        // than BluetoothDevice.BATTERY_LEVEL_UNKNOWN, it must be valid

        final int batteryLevel = getBatteryLevel();

        if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {

        if (batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {

            // TODO: name com.android.settingslib.bluetooth.Utils something different

            batteryLevelPercentageString =

                    com.android.settingslib.Utils.formatPercentage(batteryLevel);

packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { 
            CachedBluetoothDevice lastDevice = connectedDevices.get(0);

            final int batteryLevel = lastDevice.getBatteryLevel();



            if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {

            if (batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {

                return mContext.getString(

                        R.string.quick_settings_bluetooth_secondary_label_battery_level,

                        Utils.formatPercentage(batteryLevel));
@@ -390,7 +390,7 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { 
                    if (state == BluetoothProfile.STATE_CONNECTED) {

                        item.iconResId = R.drawable.ic_bluetooth_connected;

                        int batteryLevel = device.getBatteryLevel();

                        if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {

                        if (batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {

                            item.icon = new BluetoothBatteryTileIcon(batteryLevel,1 /* iconScale */);

                            item.line2 = mContext.getString(

                                    R.string.quick_settings_connected_battery_level,