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

Commit 3160b28f authored by Ze Li's avatar Ze Li Committed by Android (Google) Code Review
Browse files

Merge "[Battery refactor] Replace the update mechanism of battery metadata... 

Merge "[Battery refactor] Replace the update mechanism of battery metadata with CachedBluetoothDevice's function." into main
parents 2dfd61e2 ebfbd0ef

src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java

+30 −26
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont 
            return;

        }

        mCachedDevice.registerCallback(this);

        if (!refactorBatteryLevelDisplay()) {

            Set<BluetoothDevice> errorDevices = new HashSet<>();

            mBluetoothDevices.forEach(bd -> {

                try {
@@ -227,6 +228,7 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont 
                Log.d(TAG, "mBluetoothDevices remove " + errorDevice.getAnonymizedAddress());

            }

        }

    }



    private void unRegisterBluetoothDevice() {

        if (mBluetoothAdapter == null) {
@@ -238,6 +240,7 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont 
            return;

        }

        mCachedDevice.unregisterCallback(this);

        if (!refactorBatteryLevelDisplay()) {

            mBluetoothDevices.forEach(bd -> {

                try {

                    mBluetoothAdapter.removeOnMetadataChangedListener(bd, mMetadataListener);
@@ -247,6 +250,7 @@ public class AdvancedBluetoothDetailsHeaderController extends BasePreferenceCont 
                    Log.e(TAG, bd.getAnonymizedAddress() + ":" + e.toString());

                }

            });

        }

        mBluetoothDevices.clear();

    }

tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java

+5 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ public class AdvancedBluetoothDetailsHeaderControllerTest { 
    }



    @Test

    @DisableFlags(FLAG_REFACTOR_BATTERY_LEVEL_DISPLAY)

    public void onStart_isAvailable_registerCallback() {

        when(mBluetoothDevice.getMetadata(BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET))

                .thenReturn("true".getBytes());
@@ -472,6 +473,7 @@ public class AdvancedBluetoothDetailsHeaderControllerTest { 
    }



    @Test

    @DisableFlags(FLAG_REFACTOR_BATTERY_LEVEL_DISPLAY)

    public void onStart_notAvailable_notNeedToRegisterCallback() {

        when(mBluetoothDevice.getMetadata(BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET))

                .thenReturn("false".getBytes());
@@ -484,6 +486,7 @@ public class AdvancedBluetoothDetailsHeaderControllerTest { 
    }



    @Test

    @DisableFlags(FLAG_REFACTOR_BATTERY_LEVEL_DISPLAY)

    public void onStart_isAvailableButNoBluetoothDevice_notNeedToRegisterCallback() {

        when(mBluetoothDevice.getMetadata(BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET))

                .thenReturn("true".getBytes());
@@ -499,6 +502,7 @@ public class AdvancedBluetoothDetailsHeaderControllerTest { 
    }



    @Test

    @DisableFlags(FLAG_REFACTOR_BATTERY_LEVEL_DISPLAY)

    public void onStop_availableAndHasBluetoothDevice_unregisterCallback() {

        onStart_isAvailable_registerCallback();
@@ -510,6 +514,7 @@ public class AdvancedBluetoothDetailsHeaderControllerTest { 
    }



    @Test

    @DisableFlags(FLAG_REFACTOR_BATTERY_LEVEL_DISPLAY)

    public void onStop_noBluetoothDevice_noNeedToUnregisterCallback() {

        when(mBluetoothDevice.getMetadata(BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET))

                .thenReturn("true".getBytes());