From ace350cfdeec7a144cd9308172d7cfce22a1bceb Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Thu, 1 Apr 2021 13:06:40 -0400
Subject: [PATCH] Enable quick pickup gesture by default

Setting is configured in DozeSensors, so no need to double check in
AmbientDisplayConfiguration for the setting.

Test: manual
Bug: 176550666
Change-Id: If194e43ab5834f63e56cd1ca553b48af069d38fa
---
 .../android/hardware/display/AmbientDisplayConfiguration.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/java/android/hardware/display/AmbientDisplayConfiguration.java b/core/java/android/hardware/display/AmbientDisplayConfiguration.java
index 93e5a0ea18f33..891299760237c 100644
--- a/core/java/android/hardware/display/AmbientDisplayConfiguration.java
+++ b/core/java/android/hardware/display/AmbientDisplayConfiguration.java
@@ -102,9 +102,7 @@ public class AmbientDisplayConfiguration {
 
     /** {@hide} */
     public boolean quickPickupSensorEnabled(int user) {
-        return boolSettingDefaultOff(Settings.Secure.DOZE_QUICK_PICKUP_GESTURE, user)
-                && !TextUtils.isEmpty(quickPickupSensorType())
-                && !alwaysOnEnabled(user);
+        return !TextUtils.isEmpty(quickPickupSensorType()) && !alwaysOnEnabled(user);
     }
 
     /** {@hide} */