diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java index 109b4e2e8380..545a1ea11be3 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java @@ -233,7 +233,9 @@ public class DozeSensors { mProxCallback.accept(mCurrentlyFar); long now = SystemClock.elapsedRealtime(); - if (!mCurrentlyFar) { + if (mCurrentlyFar == null) { + // Sensor has been unregistered by the proxCallback. Do nothing. + } else if (!mCurrentlyFar) { mLastNear = now; } else if (mCurrentlyFar && now - mLastNear < COOLDOWN_TRIGGER) { // If the last near was very recent, we might be using more power for prox |