PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'android14-release' into 14-dev

Browse Source
This commit is contained in:
MrSluffy
2023-12-13 17:08:28 +08:00
parent 5931c9afec
commit 32700b0100
994 changed files with 36405 additions and 15827 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/pm/UserCache.java
+24 -1
View File
@@ -16,6 +16,10 @@
package com.android.launcher3.pm;
import static com.android.launcher3.testing.shared.TestProtocol.WORK_TAB_MISSING;
import static com.android.launcher3.testing.shared.TestProtocol.sDebugTracing;
import static com.android.launcher3.testing.shared.TestProtocol.testLogD;
import android.content.Context;
import android.content.Intent;
import android.os.UserHandle;
@@ -56,6 +60,7 @@ public class UserCache {
}
private void onUsersChanged(Intent intent) {
testLogD(WORK_TAB_MISSING, "onUsersChanged intent: " + intent);
enableAndResetCache();
mUserChangeListeners.forEach(Runnable::run);
}
@@ -84,6 +89,7 @@ public class UserCache {
List<UserHandle> users = mUserManager.getUserProfiles();
if (users != null) {
for (UserHandle user : users) {
testLogD(WORK_TAB_MISSING, "caching user: " + user);
long serial = mUserManager.getSerialNumberForUser(user);
mUsers.put(serial, user);
mUserToSerialMap.put(user, serial);
@@ -134,13 +140,30 @@ public class UserCache {
* @see UserManager#getUserProfiles()
*/
public List<UserHandle> getUserProfiles() {
StringBuilder usersToReturn = new StringBuilder();
List<UserHandle> users;
if (sDebugTracing) {
users = mUserManager.getUserProfiles();
for (UserHandle u : users) {
usersToReturn.append(u).append(" && ");
}
testLogD(WORK_TAB_MISSING, "users from userManager: " + usersToReturn);
}
synchronized (this) {
if (mUsers != null) {
usersToReturn = new StringBuilder();
for (UserHandle u : mUserToSerialMap.keySet()) {
usersToReturn.append(u).append(" && ");
}
testLogD(WORK_TAB_MISSING, "users from cache: " + usersToReturn);
return new ArrayList<>(mUserToSerialMap.keySet());
} else {
testLogD(WORK_TAB_MISSING, "users from cache null");
}
}
List<UserHandle> users = mUserManager.getUserProfiles();
users = mUserManager.getUserProfiles();
return users == null ? Collections.emptyList() : users;
}
}