Merge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev

am: d7aa26f33b Change-Id: Iadaf84ba4425de21c40dbf4ebe373e6143833c94
2017-07-07 17:44:47 +00:00
parent 7be2711d7c d7aa26f33b
commit bdc9d47c62
1 changed files with 3 additions and 1 deletions
--- 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