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

Merge "Remove BatteryController reference from ReverseChargingController"

Browse Source
This commit is contained in:
Dave Mankoff
2021-01-06 14:41:11 +00:00
committed by Android (Google) Code Review
parent 99e9f0dc5c 29046f3f10
commit cbe7ed65bd
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
View File

@@ -105,6 +105,9 @@ public interface BatteryController extends DemoMode, Dumpable,
default void onExtremeBatterySaverChanged(boolean isExtreme) {
}
default void onWirelessChargingChanged(boolean isWirlessCharging) {
}
}
/**

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

@@ -77,7 +77,7 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
private boolean mCharged;
protected boolean mPowerSave;
private boolean mAodPowerSave;
protected boolean mWirelessCharging;
private boolean mWirelessCharging;
private boolean mTestMode = false;
@VisibleForTesting
boolean mHasReceivedBattery = false;
@@ -155,6 +155,7 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
cb.onBatteryLevelChanged(mLevel, mPluggedIn, mCharging);
cb.onPowerSaveChanged(mPowerSave);
cb.onBatteryUnknownStateChanged(mStateUnknown);
cb.onWirelessChargingChanged(mWirelessCharging);
}
@Override
@@ -179,8 +180,12 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
BatteryManager.BATTERY_STATUS_UNKNOWN);
mCharged = status == BatteryManager.BATTERY_STATUS_FULL;
mCharging = mCharged || status == BatteryManager.BATTERY_STATUS_CHARGING;
mWirelessCharging = mCharging && intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0)
== BatteryManager.BATTERY_PLUGGED_WIRELESS;
if (mWirelessCharging != (mCharging
&& intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0)
== BatteryManager.BATTERY_PLUGGED_WIRELESS)) {
mWirelessCharging = !mWirelessCharging;
fireWirelessChargingChanged();
}
boolean present = intent.getBooleanExtra(EXTRA_PRESENT, true);
boolean unknown = !present;
@@ -227,6 +232,13 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
}
}
private void fireWirelessChargingChanged() {
synchronized (mChangeCallbacks) {
mChangeCallbacks.forEach(batteryStateChangeCallback ->
batteryStateChangeCallback.onWirelessChargingChanged(mWirelessCharging));
}
}
@Override
public boolean isPluggedIn() {
return mPluggedIn;