Merge "AOD: Disable if device is not yet provisioned" into oc-dr1-dev (e510562e) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ public interface DozeHost {
		void dozeTimeTick();
		boolean isPowerSaveActive();
		boolean isPulsingBlocked();
		boolean isProvisioned();

		void startPendingIntentDismissingKeyguard(PendingIntent intent);
		void abortPulsing();
		@@ -40,6 +41,7 @@ public interface DozeHost {

		void onDoubleTap(float x, float y);


		interface Callback {
		default void onNotificationHeadsUp() {}
		default void onPowerSaveChanged(boolean active) {}

+6 −15

Original line number	Diff line number	Diff line
		@@ -172,14 +172,6 @@ public class DozeTriggers implements DozeMachine.Part {
		}
		}

		private void onCarMode() {
		mMachine.requestState(DozeMachine.State.FINISH);
		}

		private void onPowerSave() {
		mMachine.requestState(DozeMachine.State.FINISH);
		}

		@Override
		public void transitionTo(DozeMachine.State oldState, DozeMachine.State newState) {
		switch (newState) {
		@@ -215,11 +207,10 @@ public class DozeTriggers implements DozeMachine.Part {
		}

		private void checkTriggersAtInit() {
		if (mUiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_CAR) {
		onCarMode();
		}
		if (mDozeHost.isPowerSaveActive()) {
		onPowerSave();
		if (mUiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_CAR
		\|\| mDozeHost.isPowerSaveActive()
		\|\| !mDozeHost.isProvisioned()) {
		mMachine.requestState(DozeMachine.State.FINISH);
		}
		}

		@@ -355,7 +346,7 @@ public class DozeTriggers implements DozeMachine.Part {
		requestPulse(DozeLog.PULSE_REASON_INTENT, false /* performedProxCheck */);
		}
		if (UiModeManager.ACTION_ENTER_CAR_MODE.equals(intent.getAction())) {
		onCarMode();
		mMachine.requestState(DozeMachine.State.FINISH);
		}
		if (Intent.ACTION_USER_SWITCHED.equals(intent.getAction())) {
		mDozeSensors.onUserSwitched();
		@@ -391,7 +382,7 @@ public class DozeTriggers implements DozeMachine.Part {
		@Override
		public void onPowerSaveChanged(boolean active) {
		if (active) {
		onPowerSave();
		mMachine.requestState(DozeMachine.State.FINISH);
		}
		}
		};

+6 −0

Original line number	Diff line number	Diff line
		@@ -5370,6 +5370,12 @@ public class StatusBar extends SystemUI implements DemoMode,
		== FingerprintUnlockController.MODE_WAKE_AND_UNLOCK;
		}

		@Override
		public boolean isProvisioned() {
		return mDeviceProvisionedController.isDeviceProvisioned()
		&& mDeviceProvisionedController.isCurrentUserSetup();
		}

		@Override
		public void startPendingIntentDismissingKeyguard(PendingIntent intent) {
		StatusBar.this.startPendingIntentDismissingKeyguard(intent);

+5 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,11 @@ class DozeHostFake implements DozeHost {
		return false;
		}

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

		@Override
		public void startPendingIntentDismissingKeyguard(PendingIntent intent) {
		throw new RuntimeException("not implemented");