Merge "Fix adaptive_sleep resetting after reboot" into rvc-dev

1 files changed, 6 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/attention/AttentionManagerService.java b/services/core/java/com/android/server/attention/AttentionManagerService.java
index 50ec0400a729..e8acbd493180 100644
--- a/services/core/java/com/android/server/attention/AttentionManagerService.java
+++ b/services/core/java/com/android/server/attention/AttentionManagerService.java
@@ -165,7 +165,7 @@ public class AttentionManagerService extends SystemService {
      * Returns {@code true} if attention service is supported on this device.
      */
     private boolean isAttentionServiceSupported() {
-        return isServiceEnabled() && isServiceAvailable();
+        return isServiceEnabled() && isServiceConfigured(mContext);
     }
 
     @VisibleForTesting
@@ -210,6 +210,11 @@ public class AttentionManagerService extends SystemService {
             return false;
         }
 
+        if (!isServiceAvailable()) {
+            Slog.w(LOG_TAG, "Service is not available at this moment.");
+            return false;
+        }
+
         // don't allow attention check in screen off state
         if (!mPowerManager.isInteractive()) {
             return false;