From 4267ff2f20a980cf3a56c843ad42f17f9c2614bd Mon Sep 17 00:00:00 2001
From: Louis Chang <louischang@google.com>
Date: Tue, 23 Nov 2021 14:26:53 +0800
Subject: [PATCH] Checking Settings config for quick pick-up gesture

...in order to turn it off while running tests

Bug: 204145453
Test: atest ActivityVisibilityTests
Change-Id: I8dcba88f6d0dc3370cb189034ca4bc2935103233
---
 .../android/hardware/display/AmbientDisplayConfiguration.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/hardware/display/AmbientDisplayConfiguration.java b/core/java/android/hardware/display/AmbientDisplayConfiguration.java
index 7d719846f3433..0b1ed65ef937a 100644
--- 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);
     }