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

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

Merge "Send current battery present state on add callback"

parents a1a508db 89f2b742

packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -150,8 +150,11 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 
            mChangeCallbacks.add(cb);

        }

        if (!mHasReceivedBattery) return;



        // Make sure new callbacks get the correct initial state

        cb.onBatteryLevelChanged(mLevel, mPluggedIn, mCharging);

        cb.onPowerSaveChanged(mPowerSave);

        cb.onBatteryUnknownStateChanged(mStateUnknown);

    }



    @Override

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BatteryControllerTest.java

+37 −0
Original line number Diff line number Diff line
@@ -16,7 +16,11 @@ 


package com.android.systemui.statusbar.policy;



import static android.os.BatteryManager.EXTRA_PRESENT;



import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Intent;
@@ -31,6 +35,7 @@ import com.android.systemui.SysuiTestCase; 
import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.demomode.DemoModeController;

import com.android.systemui.power.EnhancedEstimates;

import com.android.systemui.statusbar.policy.BatteryController.BatteryStateChangeCallback;



import org.junit.Assert;

import org.junit.Before;
@@ -98,4 +103,36 @@ public class BatteryControllerTest extends SysuiTestCase { 
        Assert.assertFalse(mBatteryController.isAodPowerSave());

    }



    @Test

    public void testBatteryPresentState_notPresent() {

        // GIVEN a battery state callback listening for changes

        BatteryStateChangeCallback cb = mock(BatteryStateChangeCallback.class);

        mBatteryController.addCallback(cb);



        // WHEN the state of the battery becomes unknown

        Intent i = new Intent(Intent.ACTION_BATTERY_CHANGED);

        i.putExtra(EXTRA_PRESENT, false);

        mBatteryController.onReceive(getContext(), i);



        // THEN the callback is notified

        verify(cb, atLeastOnce()).onBatteryUnknownStateChanged(true);

    }



    @Test

    public void testBatteryPresentState_callbackAddedAfterStateChange() {

        // GIVEN a battery state callback

        BatteryController.BatteryStateChangeCallback cb =

                mock(BatteryController.BatteryStateChangeCallback.class);



        // GIVEN the state has changed before adding a new callback

        Intent i = new Intent(Intent.ACTION_BATTERY_CHANGED);

        i.putExtra(EXTRA_PRESENT, false);

        mBatteryController.onReceive(getContext(), i);



        // WHEN a callback is added

        mBatteryController.addCallback(cb);



        // THEN it is informed about the battery state

        verify(cb, atLeastOnce()).onBatteryUnknownStateChanged(true);

    }

}