From f3880fdc678e4e2a26aefa46b38f45fb9625bd0d Mon Sep 17 00:00:00 2001 From: Haohua Li Date: Tue, 24 Mar 2020 21:59:29 +0800 Subject: [PATCH] Fix wrong variable in AccountManagerService's TokenCache // mAccountEvictors.put(k.account, tokenEvictor); // should be: mAccountEvictors.put(k.account, accountEvictor); This error in putToken() method causes the confusion of mAccountEvictors, and may causes the evict() method does not clean up the cache data correctly. Change-Id: I9435c206a6fa4d90177bbbe8816004365a213d1b Signed-off-by: Haohua Li --- services/core/java/com/android/server/accounts/TokenCache.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/accounts/TokenCache.java b/services/core/java/com/android/server/accounts/TokenCache.java index 2af2f38d8ba70..2aa9776fcab13 100644 --- a/services/core/java/com/android/server/accounts/TokenCache.java +++ b/services/core/java/com/android/server/accounts/TokenCache.java @@ -148,7 +148,7 @@ import java.util.Objects; accountEvictor = new Evictor(); } accountEvictor.add(k); - mAccountEvictors.put(k.account, tokenEvictor); + mAccountEvictors.put(k.account, accountEvictor); // Only cache the token once we can remove it directly or by account. put(k, v);