diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-07 18:00:50 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 18:00:50 +0000 |
commit | f85602b00ea8e6431d59582964f85d5c2779473c (patch) | |
tree | 0f9e5c8ce1f8224a8f336916c16b4063ffc76740 /src/com/android/launcher3/model | |
parent | 2a87fe8c41338e746c6959d992edfeb9cb00bcc1 (diff) | |
parent | 7ca3250a10d608c06a733a92cd61a2feadb9007f (diff) | |
download | android_packages_apps_Trebuchet-f85602b00ea8e6431d59582964f85d5c2779473c.tar.gz android_packages_apps_Trebuchet-f85602b00ea8e6431d59582964f85d5c2779473c.tar.bz2 android_packages_apps_Trebuchet-f85602b00ea8e6431d59582964f85d5c2779473c.zip |
am 7ca3250a: Merge "Creating a cache of users to avoid multiple calls to UserManager" into ub-launcher3-burnaby
* commit '7ca3250a10d608c06a733a92cd61a2feadb9007f':
Creating a cache of users to avoid multiple calls to UserManager
Diffstat (limited to 'src/com/android/launcher3/model')
-rw-r--r-- | src/com/android/launcher3/model/AbstractUserComparator.java | 22 | ||||
-rw-r--r-- | src/com/android/launcher3/model/AppNameComparator.java | 2 |
2 files changed, 2 insertions, 22 deletions
diff --git a/src/com/android/launcher3/model/AbstractUserComparator.java b/src/com/android/launcher3/model/AbstractUserComparator.java index cf47ce648..bd28560f3 100644 --- a/src/com/android/launcher3/model/AbstractUserComparator.java +++ b/src/com/android/launcher3/model/AbstractUserComparator.java @@ -22,14 +22,12 @@ import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.compat.UserManagerCompat; import java.util.Comparator; -import java.util.HashMap; /** * A comparator to arrange items based on user profiles. */ public abstract class AbstractUserComparator<T extends ItemInfo> implements Comparator<T> { - private HashMap<UserHandleCompat, Long> mUserSerialCache = new HashMap<>(); private final UserManagerCompat mUserManager; private final UserHandleCompat mMyUser; @@ -43,25 +41,9 @@ public abstract class AbstractUserComparator<T extends ItemInfo> implements Comp if (mMyUser.equals(lhs.user)) { return -1; } else { - Long aUserSerial = getAndCacheUserSerial(lhs.user); - Long bUserSerial = getAndCacheUserSerial(rhs.user); + Long aUserSerial = mUserManager.getSerialNumberForUser(lhs.user); + Long bUserSerial = mUserManager.getSerialNumberForUser(rhs.user); return aUserSerial.compareTo(bUserSerial); } } - - /** - * Returns the user serial for this user, using a cached serial if possible. - */ - private Long getAndCacheUserSerial(UserHandleCompat user) { - Long userSerial = mUserSerialCache.get(user); - if (userSerial == null) { - userSerial = mUserManager.getSerialNumberForUser(user); - mUserSerialCache.put(user, userSerial); - } - return userSerial; - } - - public void clearUserCache() { - mUserSerialCache.clear(); - } } diff --git a/src/com/android/launcher3/model/AppNameComparator.java b/src/com/android/launcher3/model/AppNameComparator.java index c4b74d4dc..5f80037dc 100644 --- a/src/com/android/launcher3/model/AppNameComparator.java +++ b/src/com/android/launcher3/model/AppNameComparator.java @@ -68,8 +68,6 @@ public class AppNameComparator { * Returns a locale-aware comparator that will alphabetically order a list of applications. */ public Comparator<ItemInfo> getAppInfoComparator() { - // Clear the user serial cache so that we get serials as needed in the comparator - mAppInfoComparator.clearUserCache(); return mAppInfoComparator; } |