From dc801c8170ccfcfe33bc385a83cf503ff39c9313 Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Tue, 8 Oct 2019 13:56:10 -0700 Subject: [PATCH] Reduce WTF for user-still-locked case Test: boot, launch some app shortcuts Change-Id: I8b1d604e12be3da9ebd6797828c8927a027f894e Fix: 64939202 --- .../java/com/android/server/pm/ShortcutService.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index ebba128b5f286..8253b392768fc 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -1200,12 +1200,20 @@ public class ShortcutService extends IShortcutService.Stub { return mUsers.get(userId) != null; } + private int mLastLockedUser = -1; + /** Return the per-user state. */ @GuardedBy("mLock") @NonNull ShortcutUser getUserShortcutsLocked(@UserIdInt int userId) { if (!isUserUnlockedL(userId)) { - wtf("User still locked"); + // Only do wtf once for each user. (until the user is unlocked) + if (userId != mLastLockedUser) { + wtf("User still locked"); + mLastLockedUser = userId; + } + } else { + mLastLockedUser = -1; } ShortcutUser userPackages = mUsers.get(userId);