summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lucas Dupin <dupin@google.com> 2019-09-23 22:05:04 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-09-23 22:05:04 +0000
commit0b5b9a46398b4a97d60b8375e102b11b398a3d54 (patch)
tree0c63f5336b88161676f33af94ffa43f84964a410
parent9205a8a6cc063585a7c79f8163504356db5d60b4 (diff)
parent3b745ddf4a0105ee01b42f5024be4e0370a89b6b (diff)
Merge "Do not register lift when sensor is not present"
-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 00b764bfbe9b..d9de59efb08d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt
@@ -66,6 +66,9 @@ class KeyguardLiftController constructor(
}
private fun updateListeningState() {
+ if (pickupSensor == null) {
+ return
+ }
val onKeyguard = keyguardUpdateMonitor.isKeyguardVisible &&
!statusBarStateController.isDozing