From 1e8b9c17fea1b3781ecc2e9c73492288aa6189b5 Mon Sep 17 00:00:00 2001 From: bquezada Date: Tue, 13 Apr 2021 18:20:08 +0000 Subject: [PATCH] Use config.xml for Flip to Screen Off. This allows us to disable the feature for specific builds without need for network. Test: Locally & atest FaceDownDetector Bug: 185136783 Bug: 184963215 Change-Id: I0c22dcc01aabb9b92cc16f693f7f79755ae256a8 --- core/res/res/values/config.xml | 3 +++ core/res/res/values/symbols.xml | 1 + .../core/java/com/android/server/power/FaceDownDetector.java | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index bf790fa5ff95f..f9372eb3bb3f7 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1777,6 +1777,9 @@ + + true + true diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 1ab3c849cae7a..f29985e6b0863 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -275,6 +275,7 @@ + diff --git a/services/core/java/com/android/server/power/FaceDownDetector.java b/services/core/java/com/android/server/power/FaceDownDetector.java index 676181dcfb679..e854eff53b79d 100644 --- a/services/core/java/com/android/server/power/FaceDownDetector.java +++ b/services/core/java/com/android/server/power/FaceDownDetector.java @@ -324,7 +324,9 @@ public class FaceDownDetector implements SensorEventListener { private boolean isEnabled() { return DeviceConfig.getBoolean(NAMESPACE_ATTENTION_MANAGER_SERVICE, KEY_FEATURE_ENABLED, - DEFAULT_FEATURE_ENABLED); + DEFAULT_FEATURE_ENABLED) + && mContext.getResources().getBoolean( + com.android.internal.R.bool.config_flipToScreenOffEnabled); } private float getAccelerationThreshold() {