Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I87839a718e1dde96d5cded817a741ab3e8870242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
YK Hung
2023-04-17 09:24:41 +00:00
committed by Automerger Merge Worker
parent 695477db8d 13c4524987
commit 42509b753e
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -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);

13
packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
View File

@@ -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 {