public void removeObsoletePreviews(ArrayList<Object> list) {
Utilities.assertWorkerThread();
- LongSparseArray<UserHandleCompat> userIdCache = new LongSparseArray<>();
LongSparseArray<HashSet<String>> validPackages = new LongSparseArray<>();
for (Object obj : list) {
pkg = info.provider.getPackageName();
}
- int userIdIndex = userIdCache.indexOfValue(user);
- final long userId;
- if (userIdIndex < 0) {
- userId = mUserManager.getSerialNumberForUser(user);
- userIdCache.put(userId, user);
- } else {
- userId = userIdCache.keyAt(userIdIndex);
- }
-
+ final long userId = mUserManager.getSerialNumberForUser(user);
HashSet<String> packages = validPackages.get(userId);
if (packages == null) {
packages = new HashSet<>();
import com.android.launcher3.util.LongArrayMap;
+import java.util.HashMap;
+
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
public class UserManagerCompatV17 extends UserManagerCompatV16 {
protected LongArrayMap<UserHandleCompat> mUsers;
+ // Create a separate reverse map as LongArrayMap.indexOfValue checks if objects are same
+ // and not {@link Object#equals}
+ protected HashMap<UserHandleCompat, Long> mUserToSerialMap;
+
protected UserManager mUserManager;
UserManagerCompatV17(Context context) {
public long getSerialNumberForUser(UserHandleCompat user) {
synchronized (this) {
- if (mUsers != null) {
- int index = mUsers.indexOfValue(user);
- return (index >= 0) ? mUsers.keyAt(index) : 0;
+ if (mUserToSerialMap != null) {
+ Long serial = mUserToSerialMap.get(user);
+ return serial == null ? 0 : serial;
}
}
return mUserManager.getSerialNumberForUser(user.getUser());
@Override
public void enableAndResetCache() {
synchronized (this) {
- mUsers = new LongArrayMap<UserHandleCompat>();
+ mUsers = new LongArrayMap<>();
+ mUserToSerialMap = new HashMap<>();
UserHandleCompat myUser = UserHandleCompat.myUserHandle();
- mUsers.put(mUserManager.getSerialNumberForUser(myUser.getUser()), myUser);
+ long serial = mUserManager.getSerialNumberForUser(myUser.getUser());
+ mUsers.put(serial, myUser);
+ mUserToSerialMap.put(myUser, serial);
}
}
}
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
@Override
public void enableAndResetCache() {
synchronized (this) {
- mUsers = new LongArrayMap<UserHandleCompat>();
+ mUsers = new LongArrayMap<>();
+ mUserToSerialMap = new HashMap<>();
List<UserHandle> users = mUserManager.getUserProfiles();
if (users != null) {
for (UserHandle user : users) {
- mUsers.put(mUserManager.getSerialNumberForUser(user),
- UserHandleCompat.fromUser(user));
+ long serial = mUserManager.getSerialNumberForUser(user);
+ UserHandleCompat userCompat = UserHandleCompat.fromUser(user);
+ mUsers.put(serial, userCompat);
+ mUserToSerialMap.put(userCompat, serial);
}
}
}
synchronized (this) {
if (mUsers != null) {
List<UserHandleCompat> users = new ArrayList<>();
- for (UserHandleCompat user : mUsers) {
- users.add(user);
- }
+ users.addAll(mUserToSerialMap.keySet());
return users;
}
}