summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yi Jiang <eejiang@google.com> 2019-10-24 15:13:15 -0700
committer Yi Jiang <eejiang@google.com> 2019-10-24 15:30:28 -0700
commit0f0431ec535f95ae14d39ba1eb1ba4e51d4f6a1c (patch)
tree6fcd579056feaf151fcee5df276e21568be4e37c
parentcabc32d247ab53966c6f0a516142a7d011e1248f (diff)
Removes user states in AttentionManagerService.
Bug: 137567755 Test: manual tests Change-Id: I7ca7f2025172ddbf93a8f41c6123512ca0180b8f
-rw-r--r--services/core/java/com/android/server/attention/AttentionManagerService.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/attention/AttentionManagerService.java b/services/core/java/com/android/server/attention/AttentionManagerService.java
index 087c84f1a42f..67d358910de1 100644
--- a/services/core/java/com/android/server/attention/AttentionManagerService.java
+++ b/services/core/java/com/android/server/attention/AttentionManagerService.java
@@ -23,7 +23,6 @@ import static android.service.attention.AttentionService.ATTENTION_FAILURE_UNKNO
import android.Manifest;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
-import android.app.ActivityManager;
import android.attention.AttentionManagerInternal;
import android.attention.AttentionManagerInternal.AttentionCallbackInternal;
import android.content.BroadcastReceiver;
@@ -300,7 +299,8 @@ public class AttentionManagerService extends SystemService {
@GuardedBy("mLock")
@VisibleForTesting
protected UserState getOrCreateCurrentUserStateLocked() {
- return getOrCreateUserStateLocked(ActivityManager.getCurrentUser());
+ // Doesn't need to cache the states of different users.
+ return getOrCreateUserStateLocked(0);
}
@GuardedBy("mLock")
@@ -318,7 +318,8 @@ public class AttentionManagerService extends SystemService {
@Nullable
@VisibleForTesting
protected UserState peekCurrentUserStateLocked() {
- return peekUserStateLocked(ActivityManager.getCurrentUser());
+ // Doesn't need to cache the states of different users.
+ return peekUserStateLocked(0);
}
@GuardedBy("mLock")