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

Commit e87fda39 authored by YK Hung's avatar YK Hung Committed by Automerger Merge Worker
Browse files

Merge "Remove plug/unplug condition for the incompatible charging state" into... 

Merge "Remove plug/unplug condition for the incompatible charging state" into udc-dev am: 13c45249 am: 42509b75

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



Change-Id: I75dc1f097176183b6d43e251406453283e95690b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3604772f 42509b75

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+0 −4
Original line number Diff line number Diff line
@@ -1771,10 +1771,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                        MSG_TIMEZONE_UPDATE, intent.getStringExtra(Intent.EXTRA_TIMEZONE));

                mHandler.sendMessage(msg);

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

                // Clear incompatible charger state when device is unplugged.

                if (!BatteryStatus.isPluggedIn(intent)) {

                    mIncompatibleCharger = false;

                }

                final Message msg = mHandler.obtainMessage(

                        MSG_BATTERY_UPDATE, new BatteryStatus(intent, mIncompatibleCharger));

                mHandler.sendMessage(msg);

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+0 −13
Original line number Diff line number Diff line
@@ -2527,19 +2527,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        assertThat(mKeyguardUpdateMonitor.mIncompatibleCharger).isTrue();

    }



    @Test

    public void testBatteryChangedIntent_unplugDevice_resetIncompatibleCharger() {

        mKeyguardUpdateMonitor.mIncompatibleCharger = true;

        Intent batteryChangedIntent =

                getBatteryIntent().putExtra(BatteryManager.EXTRA_PLUGGED, -1);



        mKeyguardUpdateMonitor.mBroadcastReceiver.onReceive(mContext, batteryChangedIntent);



        BatteryStatus status = verifyRefreshBatteryInfo();

        assertThat(status.incompatibleCharger.get()).isFalse();

        assertThat(mKeyguardUpdateMonitor.mIncompatibleCharger).isFalse();

    }



    @Test

    public void unfoldWakeup_requestActiveUnlock_forceDismissKeyguard()

            throws RemoteException {