Merge "Add extra logging for SysUI's userUnlocked cache" into main (2247351e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -2086,6 +2086,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab

		private void handleUserUnlocked(int userId) {
		Assert.isMainThread();
		mLogger.logUserUnlocked(userId);
		mUserIsUnlocked.put(userId, true);
		mNeedsSlowUnlockTransition = resolveNeedsSlowUnlockTransition();
		for (int i = 0; i < mCallbacks.size(); i++) {
		@@ -2098,12 +2099,15 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab

		private void handleUserStopped(int userId) {
		Assert.isMainThread();
		mUserIsUnlocked.put(userId, mUserManager.isUserUnlocked(userId));
		boolean isUnlocked = mUserManager.isUserUnlocked(userId);
		mLogger.logUserStopped(userId, isUnlocked);
		mUserIsUnlocked.put(userId, isUnlocked);
		}

		@VisibleForTesting
		void handleUserRemoved(int userId) {
		Assert.isMainThread();
		mLogger.logUserRemoved(userId);
		mUserIsUnlocked.delete(userId);
		mUserTrustIsUsuallyManaged.delete(userId);
		}
		@@ -2444,7 +2448,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab

		mTaskStackChangeListeners.registerTaskStackListener(mTaskStackListener);
		int user = mSelectedUserInteractor.getSelectedUserId(true);
		mUserIsUnlocked.put(user, mUserManager.isUserUnlocked(user));
		boolean isUserUnlocked = mUserManager.isUserUnlocked(user);
		mLogger.logUserUnlockedInitialState(user, isUserUnlocked);
		mUserIsUnlocked.put(user, isUserUnlocked);
		mLogoutEnabled = mDevicePolicyManager.isLogoutEnabled();
		updateSecondaryLockscreenRequirement(user);
		List<UserInfo> allUsers = mUserManager.getUsers();
		@@ -4059,6 +4065,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		pw.println(" strongAuthFlags=" + Integer.toHexString(strongAuthFlags));
		pw.println("ActiveUnlockRunning="
		+ mTrustManager.isActiveUnlockRunning(mSelectedUserInteractor.getSelectedUserId()));
		pw.println("userUnlockedCache[userid=" + userId + "]=" + isUserUnlocked(userId));
		pw.println("actualUserUnlocked[userid=" + userId + "]="
		+ mUserManager.isUserUnlocked(userId));
		new DumpsysTableLogger(
		"KeyguardActiveUnlockTriggers",
		KeyguardActiveUnlockModel.TABLE_HEADERS,

packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt

+38 −4

Original line number	Diff line number	Diff line
		@@ -391,6 +391,7 @@ constructor(@KeyguardUpdateMonitorLog private val logBuffer: LogBuffer) {
		{ "handleTimeFormatUpdate timeFormat=$str1" }
		)
		}

		fun logUdfpsPointerDown(sensorId: Int) {
		logBuffer.log(TAG, DEBUG, { int1 = sensorId }, { "onUdfpsPointerDown, sensorId: $int1" })
		}
		@@ -639,6 +640,7 @@ constructor(@KeyguardUpdateMonitorLog private val logBuffer: LogBuffer) {
		{ "fingerprint acquire message: $int1" }
		)
		}

		fun logForceIsDismissibleKeyguard(keepUnlocked: Boolean) {
		logBuffer.log(
		TAG,
		@@ -647,4 +649,36 @@ constructor(@KeyguardUpdateMonitorLog private val logBuffer: LogBuffer) {
		{ "keepUnlockedOnFold changed to: $bool1" }
		)
		}

		fun logUserUnlocked(userId: Int) {
		logBuffer.log(TAG, DEBUG, { int1 = userId }, { "userUnlocked userId: $int1" })
		}

		fun logUserStopped(userId: Int, isUnlocked: Boolean) {
		logBuffer.log(
		TAG,
		DEBUG,
		{
		int1 = userId
		bool1 = isUnlocked
		},
		{ "userStopped userId: $int1 isUnlocked: $bool1" }
		)
		}

		fun logUserRemoved(userId: Int) {
		logBuffer.log(TAG, DEBUG, { int1 = userId }, { "userRemoved userId: $int1" })
		}

		fun logUserUnlockedInitialState(userId: Int, isUnlocked: Boolean) {
		logBuffer.log(
		TAG,
		DEBUG,
		{
		int1 = userId
		bool1 = isUnlocked
		},
		{ "userUnlockedInitialState userId: $int1 isUnlocked: $bool1" }
		)
		}
		}