Merge "Ensure that notifications don't wake the screen even when far away." into qt-r1-dev (852c9dd2) · Commits · e / os / android_frameworks_base

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

+19 −5

Original line number	Diff line number	Diff line
		@@ -107,9 +107,17 @@ public class DozeTriggers implements DozeMachine.Part {
		}

		private void onNotification() {
		if (DozeMachine.DEBUG) Log.d(TAG, "requestNotificationPulse");
		if (DozeMachine.DEBUG) {
		Log.d(TAG, "requestNotificationPulse");
		}
		if (!sWakeDisplaySensorState) {
		Log.d(TAG, "Wake display false. Pulse denied.");
		return;
		}
		mNotificationPulseTime = SystemClock.elapsedRealtime();
		if (!mConfig.pulseOnNotificationEnabled(UserHandle.USER_CURRENT)) return;
		if (!mConfig.pulseOnNotificationEnabled(UserHandle.USER_CURRENT)) {
		return;
		}
		requestPulse(DozeLog.PULSE_REASON_NOTIFICATION, false /* performedProxCheck */);
		DozeLog.traceNotificationPulse(mContext);
		}
		@@ -216,15 +224,21 @@ public class DozeTriggers implements DozeMachine.Part {
		if (state == DozeMachine.State.DOZE_PULSING
		\|\| state == DozeMachine.State.DOZE_PULSING_BRIGHT) {
		boolean ignoreTouch = near;
		if (DEBUG) Log.i(TAG, "Prox changed, ignore touch = " + ignoreTouch);
		if (DEBUG) {
		Log.i(TAG, "Prox changed, ignore touch = " + ignoreTouch);
		}
		mDozeHost.onIgnoreTouchWhilePulsing(ignoreTouch);
		}

		if (far && (paused \|\| pausing)) {
		if (DEBUG) Log.i(TAG, "Prox FAR, unpausing AOD");
		if (DEBUG) {
		Log.i(TAG, "Prox FAR, unpausing AOD");
		}
		mMachine.requestState(DozeMachine.State.DOZE_AOD);
		} else if (near && aod) {
		if (DEBUG) Log.i(TAG, "Prox NEAR, pausing AOD");
		if (DEBUG) {
		Log.i(TAG, "Prox NEAR, pausing AOD");
		}
		mMachine.requestState(DozeMachine.State.DOZE_AOD_PAUSING);
		}
		}