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

Commit 22307453 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Dismiss low battery warning on toggling saver." into pi-dev

parents 52912687 2f6c45c9

packages/SystemUI/src/com/android/systemui/power/PowerUI.java

+12 −3
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ public class PowerUI extends SystemUI { 
    private static final long SIX_HOURS_MILLIS = Duration.ofHours(6).toMillis();



    private final Handler mHandler = new Handler();

    private final Receiver mReceiver = new Receiver();

    @VisibleForTesting

    final Receiver mReceiver = new Receiver();



    private PowerManager mPowerManager;

    private HardwarePropertiesManager mHardwarePropertiesManager;
@@ -180,11 +181,13 @@ public class PowerUI extends SystemUI { 
        throw new RuntimeException("not possible!");

    }



    private final class Receiver extends BroadcastReceiver {

    @VisibleForTesting

    final class Receiver extends BroadcastReceiver {



        public void init() {

            // Register for Intent broadcasts for...

            IntentFilter filter = new IntentFilter();

            filter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);

            filter.addAction(Intent.ACTION_BATTERY_CHANGED);

            filter.addAction(Intent.ACTION_SCREEN_OFF);

            filter.addAction(Intent.ACTION_SCREEN_ON);
@@ -195,7 +198,13 @@ public class PowerUI extends SystemUI { 
        @Override

        public void onReceive(Context context, Intent intent) {

            String action = intent.getAction();

            if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {

            if (PowerManager.ACTION_POWER_SAVE_MODE_CHANGED.equals(action)) {

                ThreadUtils.postOnBackgroundThread(() -> {

                    if (mPowerManager.isPowerSaveMode()) {

                        mWarnings.dismissLowBatteryWarning();

                    }

                });

            } else if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {

                final int oldBatteryLevel = mBatteryLevel;

                mBatteryLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 100);

                final int oldBatteryStatus = mBatteryStatus;

packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java

+42 −0
Original line number Diff line number Diff line
@@ -21,30 +21,37 @@ import static android.provider.Settings.Global.SHOW_TEMPERATURE_WARNING; 


import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertTrue;



import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.content.Intent;

import android.os.BatteryManager;

import android.os.HardwarePropertiesManager;

import android.os.PowerManager;

import android.provider.Settings;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper.RunWithLooper;

import android.testing.TestableResources;

import android.test.suitebuilder.annotation.SmallTest;



import com.android.settingslib.utils.ThreadUtils;

import com.android.systemui.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.power.PowerUI.WarningsUI;

import com.android.systemui.statusbar.phone.StatusBar;



import java.time.Duration;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



@RunWith(AndroidTestingRunner.class)

@RunWithLooper
@@ -63,15 +70,18 @@ public class PowerUITest extends SysuiTestCase { 
    private WarningsUI mMockWarnings;

    private PowerUI mPowerUI;

    private EnhancedEstimates mEnhancedEstimates;

    @Mock private PowerManager mPowerManager;



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mMockWarnings = mDependency.injectMockDependency(WarningsUI.class);

        mEnhancedEstimates = mDependency.injectMockDependency(EnhancedEstimates.class);

        mHardProps = mock(HardwarePropertiesManager.class);



        mContext.putComponent(StatusBar.class, mock(StatusBar.class));

        mContext.addMockSystemService(Context.HARDWARE_PROPERTIES_SERVICE, mHardProps);

        mContext.addMockSystemService(Context.POWER_SERVICE, mPowerManager);



        createPowerUi();

    }
@@ -407,6 +417,38 @@ public class PowerUITest extends SysuiTestCase { 
        assertTrue(shouldDismiss);

    }



    @Test

    public void testShouldDismissLowBatteryWarning_powerSaverModeEnabled()

            throws InterruptedException {

        when(mPowerManager.isPowerSaveMode()).thenReturn(true);



        mPowerUI.start();

        mPowerUI.mReceiver.onReceive(mContext,

                new Intent(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED));



        CountDownLatch latch = new CountDownLatch(1);

        ThreadUtils.postOnBackgroundThread(() -> latch.countDown());

        latch.await(5, TimeUnit.SECONDS);



        verify(mMockWarnings).dismissLowBatteryWarning();

    }



    @Test

    public void testShouldNotDismissLowBatteryWarning_powerSaverModeDisabled()

            throws InterruptedException {

        when(mPowerManager.isPowerSaveMode()).thenReturn(false);



        mPowerUI.start();

        mPowerUI.mReceiver.onReceive(mContext,

                new Intent(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED));



        CountDownLatch latch = new CountDownLatch(1);

        ThreadUtils.postOnBackgroundThread(() -> latch.countDown());

        latch.await(5, TimeUnit.SECONDS);



        verify(mMockWarnings, never()).dismissLowBatteryWarning();

    }



    private void setCurrentTemp(float temp) {

        when(mHardProps.getDeviceTemperatures(DEVICE_TEMPERATURE_SKIN, TEMPERATURE_CURRENT))

                .thenReturn(new float[] { temp });