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

Commit 3710620d authored by Chelsea Hao's avatar Chelsea Hao Committed by Automerger Merge Worker
Browse files

Merge "Display the lowest battery level of the main device and it's members."... 

Merge "Display the lowest battery level of the main device and it's members." into udc-qpr-dev am: b2b6b910 am: d974a49d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24512309



Change-Id: I0bf949266ba5c285cfc0da67e6df4f4b17c5b6ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e3d19c12 d974a49d

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

+17 −2
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import java.util.HashSet; 
import java.util.List;

import java.util.Set;

import java.util.concurrent.CopyOnWriteArrayList;

import java.util.stream.Stream;



/**

 * CachedBluetoothDevice represents a remote Bluetooth device. It contains
@@ -684,6 +685,20 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        return mDevice.getBatteryLevel();

    }



    /**

     * Get the lowest battery level from remote device and its member devices

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

     * {@link BluetoothDevice#BATTERY_LEVEL_UNKNOWN}

     */

    public int getMinBatteryLevelWithMemberDevices() {

        return Stream.concat(Stream.of(this), mMemberDevices.stream())

                .mapToInt(cachedDevice -> cachedDevice.getBatteryLevel())

                .filter(batteryLevel -> batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN)

                .min()

                .orElse(BluetoothDevice.BATTERY_LEVEL_UNKNOWN);

    }





    void refresh() {

        ThreadUtils.postOnBackgroundThread(() -> {

            if (BluetoothUtils.isAdvancedDetailsHeader(mDevice)) {
@@ -1185,7 +1200,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        // 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();

        final int batteryLevel = getMinBatteryLevelWithMemberDevices();

        if (batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {

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

            batteryLevelPercentageString =
@@ -1360,7 +1375,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        // 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();

        final int batteryLevel = getMinBatteryLevelWithMemberDevices();

        if (batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {

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

            batteryLevelPercentageString =

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java

+45 −0
Original line number Diff line number Diff line
@@ -528,6 +528,51 @@ public class CachedBluetoothDeviceTest { 
        assertThat(mCachedDevice.getConnectionSummary()).isNull();

    }



    @Test

    public void getConnectionSummary_testMemberDevicesExist_returnMinBattery() {

        // One device is active with battery level 70.

        mBatteryLevel = 70;

        updateProfileStatus(mA2dpProfile, BluetoothProfile.STATE_CONNECTED);

        mCachedDevice.onActiveDeviceChanged(true, BluetoothProfile.A2DP);





        // Add a member device with battery level 30.

        int lowerBatteryLevel = 30;

        mCachedDevice.addMemberDevice(mSubCachedDevice);

        doAnswer((invocation) -> lowerBatteryLevel).when(mSubCachedDevice).getBatteryLevel();



        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Active, 30% battery");

    }



    @Test

    public void getConnectionSummary_testMemberDevicesBatteryUnknown_returnMinBattery() {

        // One device is active with battery level 70.

        mBatteryLevel = 70;

        updateProfileStatus(mA2dpProfile, BluetoothProfile.STATE_CONNECTED);

        mCachedDevice.onActiveDeviceChanged(true, BluetoothProfile.A2DP);



        // Add a member device with battery level unknown.

        mCachedDevice.addMemberDevice(mSubCachedDevice);

        doAnswer((invocation) -> BluetoothDevice.BATTERY_LEVEL_UNKNOWN).when(

                mSubCachedDevice).getBatteryLevel();



        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Active, 70% battery");

    }



    @Test

    public void getConnectionSummary_testAllDevicesBatteryUnknown_returnNoBattery() {

        // One device is active with battery level unknown.

        updateProfileStatus(mA2dpProfile, BluetoothProfile.STATE_CONNECTED);

        mCachedDevice.onActiveDeviceChanged(true, BluetoothProfile.A2DP);



        // Add a member device with battery level unknown.

        mCachedDevice.addMemberDevice(mSubCachedDevice);

        doAnswer((invocation) -> BluetoothDevice.BATTERY_LEVEL_UNKNOWN).when(

                mSubCachedDevice).getBatteryLevel();



        assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Active");

    }



    @Test

    public void getConnectionSummary_testMultipleProfilesActiveDevice() {

        // Test without battery level

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

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { 
                listenToMetadata(device);

            } else {

                stopListeningToStaleDeviceMetadata();

                batteryLevel = device.getBatteryLevel();

                batteryLevel = device.getMinBatteryLevelWithMemberDevices();

            }



            if (batteryLevel > BluetoothDevice.BATTERY_LEVEL_UNKNOWN) {

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/BluetoothTileTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ class BluetoothTileTest : SysuiTestCase() { 
        val btDevice = mock<BluetoothDevice>()

        whenever(cachedDevice2.device).thenReturn(btDevice)

        whenever(btDevice.getMetadata(BluetoothDevice.METADATA_MAIN_BATTERY)).thenReturn(null)

        whenever(cachedDevice2.batteryLevel).thenReturn(25)

        whenever(cachedDevice2.minBatteryLevelWithMemberDevices).thenReturn(25)

        addConnectedDevice(cachedDevice2)



        tile.handleUpdateState(state, /* arg= */ null)