Merge "Checking Settings config for quick pick-up gesture" into sc-v2-dev

2021-11-24 01:31:47 +00:00
parent 26fffc68d9 4267ff2f20
commit fcfd7e1a79
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/hardware/display/AmbientDisplayConfiguration.java
+++ b/core/java/android/hardware/display/AmbientDisplayConfiguration.java
@@ -109,7 +109,8 @@ public class AmbientDisplayConfiguration {

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