Merge "Log UserManager users and cached users each time users accessed" into udc-dev am: ffdcac46b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23604024 Change-Id: Ia637de10c491be2e6367c6a2d47c13d5f083d9c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -17,6 +17,7 @@
|
|||||||
package com.android.launcher3.pm;
|
package com.android.launcher3.pm;
|
||||||
|
|
||||||
import static com.android.launcher3.testing.shared.TestProtocol.WORK_TAB_MISSING;
|
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 static com.android.launcher3.testing.shared.TestProtocol.testLogD;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
@@ -140,8 +141,18 @@ public class UserCache {
|
|||||||
*/
|
*/
|
||||||
public List<UserHandle> getUserProfiles() {
|
public List<UserHandle> getUserProfiles() {
|
||||||
StringBuilder usersToReturn = new StringBuilder();
|
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) {
|
synchronized (this) {
|
||||||
if (mUsers != null) {
|
if (mUsers != null) {
|
||||||
|
usersToReturn = new StringBuilder();
|
||||||
for (UserHandle u : mUserToSerialMap.keySet()) {
|
for (UserHandle u : mUserToSerialMap.keySet()) {
|
||||||
usersToReturn.append(u).append(" && ");
|
usersToReturn.append(u).append(" && ");
|
||||||
}
|
}
|
||||||
@@ -152,11 +163,7 @@ public class UserCache {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
List<UserHandle> users = mUserManager.getUserProfiles();
|
users = mUserManager.getUserProfiles();
|
||||||
for (UserHandle u : users) {
|
|
||||||
usersToReturn.append(u).append(" && ");
|
|
||||||
}
|
|
||||||
testLogD(WORK_TAB_MISSING, "users from userManager: " + usersToReturn);
|
|
||||||
return users == null ? Collections.emptyList() : users;
|
return users == null ? Collections.emptyList() : users;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user