Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix adaptive_sleep resetting after reboot" into rvc-dev am: f9551ba4e1 am: ca31f89c74

Browse Source 
Change-Id: I414bfe546684062013384402ac1a336f92c22259
This commit is contained in:
Alex Salo
2020-04-13 20:48:41 +00:00
committed by Automerger Merge Worker
parent 76bed46c5c ca31f89c74
commit 76658dac62
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/attention/AttentionManagerService.java
View File

@@ -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;