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

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

+6 −1

Original line number	Original line	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.		* Returns {@code true} if attention service is supported on this device.
	*/		*/
	private boolean isAttentionServiceSupported() {		private boolean isAttentionServiceSupported() {
	return isServiceEnabled() && isServiceAvailable();		return isServiceEnabled() && isServiceConfigured(mContext);
	}		}

	@VisibleForTesting		@VisibleForTesting
	@@ -210,6 +210,11 @@ public class AttentionManagerService extends SystemService {
	return false;		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		// don't allow attention check in screen off state
	if (!mPowerManager.isInteractive()) {		if (!mPowerManager.isInteractive()) {
	return false;		return false;