Merge "Keep interrupts on when in battery saver mode" (b16f362a) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/src/com/android/systemui/car/CarNotificationInterruptionStateProvider.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.statusbar.notification.NotificationFilter;
		import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		import com.android.systemui.statusbar.policy.BatteryController;

		import javax.inject.Inject;
		import javax.inject.Singleton;
		@@ -34,8 +35,9 @@ public class CarNotificationInterruptionStateProvider extends
		@Inject
		public CarNotificationInterruptionStateProvider(Context context,
		NotificationFilter filter,
		StatusBarStateController stateController) {
		super(context, filter, stateController);
		StatusBarStateController stateController,
		BatteryController batteryController) {
		super(context, filter, stateController, batteryController);
		}

		@Override

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarBatteryController.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -257,6 +257,11 @@ public class CarBatteryController extends BroadcastReceiver implements BatteryCo
		return false;
		}

		@Override
		public boolean isAodPowerSave() {
		return false;
		}

		private void notifyBatteryLevelChanged() {
		for (int i = 0, size = mChangeCallbacks.size(); i < size; i++) {
		mChangeCallbacks.get(i)

packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import com.android.systemui.keyguard.WakefulnessLifecycle;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.statusbar.phone.BiometricUnlockController;
		import com.android.systemui.statusbar.phone.DozeParameters;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.util.sensors.AsyncSensorManager;
		import com.android.systemui.util.sensors.ProximitySensor;
		import com.android.systemui.util.wakelock.DelayedWakeLock;
		@@ -66,7 +67,7 @@ public class DozeFactory {
		params);

		DozeMachine machine = new DozeMachine(wrappedService, config, wakeLock,
		wakefulnessLifecycle, dozeLog);
		wakefulnessLifecycle, Dependency.get(BatteryController.class), dozeLog);
		machine.setParts(new DozeMachine.Part[]{
		new DozePauser(handler, machine, alarmManager, params.getPolicy()),
		new DozeFalsingManagerAdapter(falsingManager),

packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import com.android.internal.util.Preconditions;
		import com.android.systemui.keyguard.WakefulnessLifecycle;
		import com.android.systemui.keyguard.WakefulnessLifecycle.Wakefulness;
		import com.android.systemui.statusbar.phone.DozeParameters;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.util.Assert;
		import com.android.systemui.util.wakelock.WakeLock;

		@@ -122,6 +123,7 @@ public class DozeMachine {
		private final WakeLock mWakeLock;
		private final AmbientDisplayConfiguration mConfig;
		private final WakefulnessLifecycle mWakefulnessLifecycle;
		private final BatteryController mBatteryController;
		private Part[] mParts;

		private final ArrayList<State> mQueuedRequests = new ArrayList<>();
		@@ -130,11 +132,13 @@ public class DozeMachine {
		private boolean mWakeLockHeldForCurrentState = false;

		public DozeMachine(Service service, AmbientDisplayConfiguration config,
		WakeLock wakeLock, WakefulnessLifecycle wakefulnessLifecycle, DozeLog dozeLog) {
		WakeLock wakeLock, WakefulnessLifecycle wakefulnessLifecycle,
		BatteryController batteryController, DozeLog dozeLog) {
		mDozeService = service;
		mConfig = config;
		mWakefulnessLifecycle = wakefulnessLifecycle;
		mWakeLock = wakeLock;
		mBatteryController = batteryController;
		mDozeLog = dozeLog;
		}

		@@ -318,6 +322,9 @@ public class DozeMachine {
		Log.i(TAG, "Dropping pulse done because current state is already done: " + mState);
		return mState;
		}
		if (requestedState == State.DOZE_AOD && mBatteryController.isAodPowerSave()) {
		return State.DOZE;
		}
		if (requestedState == State.DOZE_REQUEST_PULSE && !mState.canPulse()) {
		Log.i(TAG, "Dropping pulse request because current state can't pulse: " + mState);
		return mState;

packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -348,7 +348,6 @@ public class DozeTriggers implements DozeMachine.Part {

		private void checkTriggersAtInit() {
		if (mUiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_CAR
		\|\| mDozeHost.isPowerSaveActive()
		\|\| mDozeHost.isBlockingDoze()
		\|\| !mDozeHost.isProvisioned()) {
		mMachine.requestState(DozeMachine.State.FINISH);
		@@ -484,8 +483,8 @@ public class DozeTriggers implements DozeMachine.Part {

		@Override
		public void onPowerSaveChanged(boolean active) {
		if (active) {
		mMachine.requestState(DozeMachine.State.FINISH);
		if (mDozeHost.isPowerSaveActive()) {
		mMachine.requestState(DozeMachine.State.DOZE);
		}
		}
		};