From 0a410d3a6c4d7cff0d617e501ecc14e61219a358 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Mon, 23 Sep 2019 11:54:56 -0700 Subject: [PATCH] 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) --- .../android/systemui/statusbar/phone/KeyguardLiftController.kt | 3 +++ 1 file changed, 3 insertions(+) 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 f4635d1270a8a..f7b8a2e29129f 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