summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/doze
diff options
context:
space:
mode:
authorEthan Chen <intervigil@gmail.com>2015-04-28 12:56:52 -0700
committerSteve Kondik <steve@cyngn.com>2015-10-26 21:55:39 -0700
commit042e48565fbaf3a4e70ba075a9f518f037356fc9 (patch)
treef7d28d88a6089ebe18cdedbe599446361296ddfd /packages/SystemUI/src/com/android/systemui/doze
parent6ee17f52a99b6f63780e8604887a58fd69860d30 (diff)
downloadframeworks_base-042e48565fbaf3a4e70ba075a9f518f037356fc9.zip
frameworks_base-042e48565fbaf3a4e70ba075a9f518f037356fc9.tar.gz
frameworks_base-042e48565fbaf3a4e70ba075a9f518f037356fc9.tar.bz2
doze: Separate proximity check by reason
* Devices that pulse by intent typically check the proximity sensor as part of sensor wakeup. Allow pulse by intent to control proximity check separate from pulse by sensor wakeup. Change-Id: I9955013b864746c52ee576ff0f4de3672bf7fe0e
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/doze')
-rw-r--r--packages/SystemUI/src/com/android/systemui/doze/DozeService.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
index 4759538..2ac8528 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
@@ -217,8 +217,7 @@ public class DozeService extends DreamService {
// Here we need a wakelock to stay awake until the pulse is finished.
mWakeLock.acquire();
mPulsing = true;
- if (!mDozeParameters.getProxCheckBeforePulse() ||
- reason == DozeLog.PULSE_REASON_INTENT) {
+ if (!mDozeParameters.getProxCheckBeforePulse(reason)) {
// skip proximity check
continuePulsing(reason);
return;