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

Merge "Ensure that notifications don't wake the screen even when far away." into qt-r1-dev

Browse Source 
am: 5818d2f606

Change-Id: I32e7c954a274bbfd60c0ca96c4aca375ea3a983d
This commit is contained in:
Dave Mankoff
2019-06-28 14:44:58 -07:00
committed by android-build-merger
parent 8ecabb4be3 5818d2f606
commit 32eeff7fcb
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
View File

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