summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Dupin <dupin@google.com>2019-09-23 11:54:56 -0700
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-11-16 00:26:57 +0000
commit0e55dee6b24fe357bc04e4f0313f2028e027bc47 (patch)
treed3ddfc08f36aab416b6fd980b8e10b6fa7343b83
parentade6701ea4312313a9e0c34de89808acff079fff (diff)
downloadbase-0e55dee6b24fe357bc04e4f0313f2028e027bc47.tar.gz
Do not register lift when sensor is not present
Bug: 141284056 Fixes: 142365481 Test: force snesor to return null Change-Id: I45583e4f1c06ec7088a7d6335597a8671555f339 (cherry picked from commit 3b745ddf4a0105ee01b42f5024be4e0370a89b6b) (cherry picked from commit 0a410d3a6c4d7cff0d617e501ecc14e61219a358)
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt
index f4635d1270a8..f7b8a2e29129 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt
@@ -67,6 +67,9 @@ class KeyguardLiftController constructor(
}
private fun updateListeningState() {
+ if (pickupSensor == null) {
+ return
+ }
val onKeyguard = keyguardUpdateMonitor.isKeyguardVisible &&
!statusBarStateController.isDozing