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

Merge "AOD: Skip prox check if cached prox value available" into oc-dr1-dev

Browse Source 
am: f96573f894

Change-Id: Ia89613aac856b104b32394d6040aa4694327cf55
This commit is contained in:
Adrian Roos
2017-07-25 14:01:07 +00:00
committed by android-build-merger
parent 2b0cef9401 f96573f894
commit 2d8b3ec7c3
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java
View File

@@ -184,6 +184,13 @@ public class DozeSensors {
pw.print("ProxSensor: "); pw.println(mProxSensor.toString()); pw.print("ProxSensor: "); pw.println(mProxSensor.toString());
} }
/**
* @return true if prox is currently far, false if near or null if unknown.
*/
public Boolean isProximityCurrentlyFar() {
return mProxSensor.mCurrentlyFar;
}
private class ProxSensor implements SensorEventListener { private class ProxSensor implements SensorEventListener {
static final long COOLDOWN_TRIGGER = 2 * 1000; static final long COOLDOWN_TRIGGER = 2 * 1000;

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

@@ -103,8 +103,11 @@ public class DozeTriggers implements DozeMachine.Part {
private void proximityCheckThenCall(IntConsumer callback, private void proximityCheckThenCall(IntConsumer callback,
boolean alreadyPerformedProxCheck, boolean alreadyPerformedProxCheck,
int pulseReason) { int pulseReason) {
Boolean cachedProxFar = mDozeSensors.isProximityCurrentlyFar();
if (alreadyPerformedProxCheck) { if (alreadyPerformedProxCheck) {
callback.accept(ProximityCheck.RESULT_NOT_CHECKED); callback.accept(ProximityCheck.RESULT_NOT_CHECKED);
} else if (cachedProxFar != null) {
callback.accept(cachedProxFar ? ProximityCheck.RESULT_FAR : ProximityCheck.RESULT_NEAR);
} else { } else {
final long start = SystemClock.uptimeMillis(); final long start = SystemClock.uptimeMillis();
new ProximityCheck() { new ProximityCheck() {