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

2021-11-18 15:33:18 +00:00
parent 8dfb06f117 5deab1f755
commit b17c10f621
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} */