diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 906a7403298f0..419f142d0795a 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1772,6 +1772,9 @@ + + true + true diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 34dcaa0c78b2b..d69c7f8f95876 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 474ce59212ff4..816c81ddf3059 100644 --- a/services/core/java/com/android/server/power/FaceDownDetector.java +++ b/services/core/java/com/android/server/power/FaceDownDetector.java @@ -330,7 +330,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() {