Merge "Fix adaptive_sleep resetting after reboot" into rvc-dev am: f9551ba4e1... (3a4aebae) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/attention/AttentionManagerService.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -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;