Merge "Make quickPickup gesture depend on liftToWake" into sc-v2-dev am: b17c10f621

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16242790 Change-Id: Iea643f7fa9f9fff4d9a73fe40b56dc5d6f180ee4
2021-11-18 19:51:39 +00:00
parent b6bb0424f0 b17c10f621
commit 808e2e2979
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/hardware/display/AmbientDisplayConfiguration.java
+++ b/core/java/android/hardware/display/AmbientDisplayConfiguration.java
@@ -109,7 +109,9 @@ public class AmbientDisplayConfiguration {

    /** {@hide} */
    public boolean quickPickupSensorEnabled(int user) {
-        return !TextUtils.isEmpty(quickPickupSensorType()) && !alwaysOnEnabled(user);
+        return !TextUtils.isEmpty(quickPickupSensorType())
+                && pickupGestureEnabled(user)
+                && !alwaysOnEnabled(user);
    }

    /** {@hide} */