Revert "Add LogBuffers to KeyguardViewMediator"
Revert submission 19570010-add_logbuffers_keyguardviewmediator-master
Reason for revert: b/243854740
Reverted Changes:
Ie0d04359a:Add LogBuffers to KeyguardViewMediator
Idfd7fef75:Add LogBuffers to KeyguardViewMediator
Change-Id: I3510d9e36184bf0f0dbce77ff1add853424436b1
diff --git a/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt b/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt
index 6c452bd..d718a24 100644
--- a/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt
+++ b/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt
@@ -45,7 +45,7 @@
fun e(@CompileTimeConstant msg: String) = log(msg, ERROR)
- fun v(@CompileTimeConstant msg: String) = log(msg, VERBOSE)
+ fun v(@CompileTimeConstant msg: String) = log(msg, ERROR)
fun w(@CompileTimeConstant msg: String) = log(msg, WARNING)
diff --git a/packages/SystemUI/src/com/android/keyguard/logging/KeyguardViewMediatorLogger.kt b/packages/SystemUI/src/com/android/keyguard/logging/KeyguardViewMediatorLogger.kt
deleted file mode 100644
index f54bf02..0000000
--- a/packages/SystemUI/src/com/android/keyguard/logging/KeyguardViewMediatorLogger.kt
+++ /dev/null
@@ -1,690 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.keyguard.logging
-
-import android.os.RemoteException
-import android.view.WindowManagerPolicyConstants
-import com.android.systemui.dagger.SysUISingleton
-import com.android.systemui.log.LogBuffer
-import com.android.systemui.log.LogLevel.DEBUG
-import com.android.systemui.log.LogLevel.ERROR
-import com.android.systemui.log.LogLevel.INFO
-import com.android.systemui.log.LogLevel.WARNING
-import com.android.systemui.log.LogLevel.WTF
-import com.android.systemui.log.dagger.KeyguardViewMediatorLog
-import javax.inject.Inject
-
-private const val TAG = "KeyguardViewMediatorLog"
-
-@SysUISingleton
-class KeyguardViewMediatorLogger @Inject constructor(
- @KeyguardViewMediatorLog private val logBuffer: LogBuffer,
-) {
-
- fun logFailedLoadLockSound(soundPath: String) {
- logBuffer.log(
- TAG,
- WARNING,
- { str1 = soundPath },
- { "failed to load lock sound from $str1" }
- )
- }
-
- fun logFailedLoadUnlockSound(soundPath: String) {
- logBuffer.log(
- TAG,
- WARNING,
- { str1 = soundPath },
- { "failed to load unlock sound from $str1" }
- )
- }
-
- fun logFailedLoadTrustedSound(soundPath: String) {
- logBuffer.log(
- TAG,
- WARNING,
- { str1 = soundPath },
- { "failed to load trusted sound from $str1" }
- )
- }
-
- fun logOnSystemReady() {
- logBuffer.log(TAG, DEBUG, "onSystemReady")
- }
-
- fun logOnStartedGoingToSleep(offReason: Int) {
- val offReasonString = WindowManagerPolicyConstants.offReasonToString(offReason)
- logBuffer.log(
- TAG,
- DEBUG,
- { str1 = offReasonString },
- { "onStartedGoingToSleep($str1)" }
- )
- }
-
- fun logPendingExitSecureCallbackCancelled() {
- logBuffer.log(TAG, DEBUG, "pending exit secure callback cancelled")
- }
-
- fun logFailedOnKeyguardExitResultFalse(remoteException: RemoteException) {
- logBuffer.log(
- TAG,
- WARNING,
- "Failed to call onKeyguardExitResult(false)",
- remoteException
- )
- }
-
- fun logOnFinishedGoingToSleep(offReason: Int) {
- val offReasonString = WindowManagerPolicyConstants.offReasonToString(offReason)
- logBuffer.log(
- TAG,
- DEBUG,
- { str1 = offReasonString },
- { "onFinishedGoingToSleep($str1)" }
- )
- }
-
- fun logPinLockRequestedStartingKeyguard() {
- logBuffer.log(TAG, INFO, "PIN lock requested, starting keyguard")
- }
-
- fun logUserSwitching(userId: Int) {
- logBuffer.log(
- TAG,
- DEBUG,
- { int1 = userId },
- { "onUserSwitching $int1" }
- )
- }
-
- fun logOnUserSwitchComplete(userId: Int) {
- logBuffer.log(
- TAG,
- DEBUG,
- { int1 = userId },
- { "onUserSwitchComplete $int1" }
- )
- }
-
- fun logOnSimStateChanged(subId: Int, slotId: Int, simState: String) {
- logBuffer.log(
- TAG,
- DEBUG,
- {
- int1 = subId
- int2 = slotId
- str1 = simState
- },
- { "onSimStateChanged(subId=$int1, slotId=$int2, state=$str1)" }
- )
- }
-
- fun logFailedToCallOnSimSecureStateChanged(remoteException: RemoteException) {
- logBuffer.log(
- TAG,
- WARNING,
- "Failed to call onSimSecureStateChanged",
- remoteException
- )
- }
-
- fun logIccAbsentIsNotShowing() {
- logBuffer.log(TAG, DEBUG, "ICC_ABSENT isn't showing, we need to show the " +
- "keyguard since the device isn't provisioned yet.")
- }
-
- fun logSimMovedToAbsent() {
- logBuffer.log(TAG, DEBUG, "SIM moved to ABSENT when the " +
- "previous state was locked. Reset the state.")
- }
-
- fun logIntentValueIccLocked() {
- logBuffer.log(TAG, DEBUG, "INTENT_VALUE_ICC_LOCKED and keyguard isn't " +
- "showing; need to show keyguard so user can enter sim pin")
- }
-
- fun logPermDisabledKeyguardNotShowing() {
- logBuffer.log(TAG, DEBUG, "PERM_DISABLED and keyguard isn't showing.")
- }
-
- fun logPermDisabledResetStateLocked() {
- logBuffer.log(TAG, DEBUG, "PERM_DISABLED, resetStateLocked to show permanently " +
- "disabled message in lockscreen.")
- }
-
- fun logReadyResetState(showing: Boolean) {
- logBuffer.log(
- TAG,
- DEBUG,
- { bool1 = showing },
- { "READY, reset state? $bool1"}
- )
- }
-
- fun logSimMovedToReady() {
- logBuffer.log(TAG, DEBUG, "SIM moved to READY when the previously was locked. " +
- "Reset the state.")
- }
-
- fun logUnspecifiedSimState(simState: Int) {
- logBuffer.log(
- TAG,
- DEBUG,
- { int1 = simState },
- { "Unspecific state: $int1" }
- )
- }
-
- fun logOccludeLaunchAnimationCancelled(occluded: Boolean) {
- logBuffer.log(
- TAG,
- DEBUG,
- { bool1 = occluded },
- { "Occlude launch animation cancelled. Occluded state is now: $bool1"}
- )
- }
-
- fun logActivityLaunchAnimatorLaunchContainerChanged() {
- logBuffer.log(TAG, WTF, "Someone tried to change the launch container for the " +
- "ActivityLaunchAnimator, which should never happen.")
- }
-
- fun logVerifyUnlock() {
- logBuffer.log(TAG, DEBUG, "verifyUnlock")
- }
-
- fun logIgnoreUnlockDeviceNotProvisioned() {
- logBuffer.log(TAG, DEBUG, "ignoring because device isn't provisioned")
- }
-
- fun logFailedToCallOnKeyguardExitResultFalse(remoteException: RemoteException) {
- logBuffer.log(
- TAG,
- WARNING,
- "Failed to call onKeyguardExitResult(false)",
- remoteException
- )
- }
-
- fun logVerifyUnlockCalledNotExternallyDisabled() {
- logBuffer.log(TAG, WARNING, "verifyUnlock called when not externally disabled")
- }
-
- fun logSetOccluded(isOccluded: Boolean) {
- logBuffer.log(
- TAG,
- DEBUG,
- { bool1 = isOccluded },
- { "setOccluded($bool1)" }
- )
- }
-
- fun logHandleSetOccluded(isOccluded: Boolean) {
- logBuffer.log(
- TAG,
- DEBUG,
- { bool1 = isOccluded },
- { "handleSetOccluded($bool1)" }
- )
- }
-
- fun logIgnoreHandleShow() {
- logBuffer.log(TAG, DEBUG, "ignoring handleShow because system is not ready.")
- }
-
- fun logHandleShow() {
- logBuffer.log(TAG, DEBUG, "handleShow")
- }
-
- fun logHandleHide() {
- logBuffer.log(TAG, DEBUG, "handleHide")
- }
-
- fun logSplitSystemUserQuitUnlocking() {
- logBuffer.log(TAG, DEBUG, "Split system user, quit unlocking.")
- }
-
- fun logHandleStartKeyguardExitAnimation(startTime: Long, fadeoutDuration: Long) {
- logBuffer.log(
- TAG,
- DEBUG,
- {
- long1 = startTime
- long2 = fadeoutDuration
- },
- { "handleStartKeyguardExitAnimation startTime=$long1 fadeoutDuration=$long2" }
- )
- }
-
- fun logHandleVerifyUnlock() {
- logBuffer.log(TAG, DEBUG, "handleVerifyUnlock")
- }
-
- fun logHandleNotifyStartedGoingToSleep() {
- logBuffer.log(TAG, DEBUG, "handleNotifyStartedGoingToSleep")
- }
-
- fun logHandleNotifyFinishedGoingToSleep() {
- logBuffer.log(TAG, DEBUG, "handleNotifyFinishedGoingToSleep")
- }
-
- fun logHandleNotifyWakingUp() {
- logBuffer.log(TAG, DEBUG, "handleNotifyWakingUp")
- }
-
- fun logHandleReset() {
- logBuffer.log(TAG, DEBUG, "handleReset")
- }
-
- fun logKeyguardDone() {
- logBuffer.log(TAG, DEBUG, "keyguardDone")
- }
-
- fun logKeyguardDonePending() {
- logBuffer.log(TAG, DEBUG, "keyguardDonePending")
- }
-
- fun logKeyguardGone() {
- logBuffer.log(TAG, DEBUG, "keyguardGone")
- }
-
- fun logUnoccludeAnimationCancelled(isOccluded: Boolean) {
- logBuffer.log(
- TAG,
- DEBUG,
- { bool1 = isOccluded },
- { "Unocclude animation cancelled. Occluded state is now: $bool1" }
- )
- }
-
- fun logShowLocked() {
- logBuffer.log(TAG, DEBUG, "showLocked")
- }
-
- fun logHideLocked() {
- logBuffer.log(TAG, DEBUG, "hideLocked")
- }
-
- fun logResetStateLocked() {
- logBuffer.log(TAG, DEBUG, "resetStateLocked")
- }
-
- fun logNotifyStartedGoingToSleep() {
- logBuffer.log(TAG, DEBUG, "notifyStartedGoingToSleep")
- }
-
- fun logNotifyFinishedGoingToSleep() {
- logBuffer.log(TAG, DEBUG, "notifyFinishedGoingToSleep")
- }
-
- fun logNotifyStartedWakingUp() {
- logBuffer.log(TAG, DEBUG, "notifyStartedWakingUp")
- }
-
- fun logDoKeyguardShowingLockScreen() {
- logBuffer.log(TAG, DEBUG, "doKeyguard: showing the lock screen")
- }
-
- fun logDoKeyguardNotShowingLockScreenOff() {
- logBuffer.log(TAG, DEBUG, "doKeyguard: not showing because lockscreen is off")
- }
-
- fun logDoKeyguardNotShowingDeviceNotProvisioned() {
- logBuffer.log(TAG, DEBUG, "doKeyguard: not showing because device isn't " +
- "provisioned and the sim is not locked or missing")
- }
-
- fun logDoKeyguardNotShowingAlreadyShowing() {
- logBuffer.log(TAG, DEBUG, "doKeyguard: not showing because it is already showing")
- }
-
- fun logDoKeyguardNotShowingBootingCryptkeeper() {
- logBuffer.log(TAG, DEBUG, "doKeyguard: not showing because booting to cryptkeeper")
- }
-
- fun logDoKeyguardNotShowingExternallyDisabled() {
- logBuffer.log(TAG, DEBUG, "doKeyguard: not showing because externally disabled")
- }
-
- fun logFailedToCallOnDeviceProvisioned(remoteException: RemoteException) {
- logBuffer.log(
- TAG,
- WARNING,
- "Failed to call onDeviceProvisioned",
- remoteException
- )
- }
-
- fun logMaybeHandlePendingLockNotHandling() {
- logBuffer.log(TAG, DEBUG, "#maybeHandlePendingLock: not handling because the " +
- "screen off animation's isKeyguardShowDelayed() returned true. This should be " +
- "handled soon by #onStartedWakingUp, or by the end actions of the " +
- "screen off animation.")
- }
-
- fun logMaybeHandlePendingLockKeyguardGoingAway() {
- logBuffer.log(TAG, DEBUG, "#maybeHandlePendingLock: not handling because the " +
- "keyguard is going away. This should be handled shortly by " +
- "StatusBar#finishKeyguardFadingAway.")
- }
-
- fun logMaybeHandlePendingLockHandling() {
- logBuffer.log(TAG, DEBUG, "#maybeHandlePendingLock: handling pending lock; " +
- "locking keyguard.")
- }
-
- fun logSetAlarmToTurnOffKeyguard(delayedShowingSequence: Int) {
- logBuffer.log(
- TAG,
- DEBUG,
- { int1 = delayedShowingSequence },
- { "setting alarm to turn off keyguard, seq = $int1" }
- )
- }
-
- fun logOnStartedWakingUp(delayedShowingSequence: Int) {
- logBuffer.log(
- TAG,
- DEBUG,
- { int1 = delayedShowingSequence },
- { "onStartedWakingUp, seq = $int1" }
- )
- }
-
- fun logSetKeyguardEnabled(enabled: Boolean) {
- logBuffer.log(
- TAG,
- DEBUG,
- { bool1 = enabled },
- { "setKeyguardEnabled($bool1)" }
- )
- }
-
- fun logIgnoreVerifyUnlockRequest() {
- logBuffer.log(TAG, DEBUG, "in process of verifyUnlock request, ignoring")
- }
-
- fun logRememberToReshowLater() {
- logBuffer.log(TAG, DEBUG, "remembering to reshow, hiding keyguard, disabling " +
- "status bar expansion")
- }
-
- fun logPreviouslyHiddenReshow() {
- logBuffer.log(TAG, DEBUG, "previously hidden, reshowing, reenabling status " +
- "bar expansion")
- }
-
- fun logOnKeyguardExitResultFalseResetting() {
- logBuffer.log(TAG, DEBUG, "onKeyguardExitResult(false), resetting")
- }
-
- fun logWaitingUntilKeyguardVisibleIsFalse() {
- logBuffer.log(TAG, DEBUG, "waiting until mWaitingUntilKeyguardVisible is false")
- }
-
- fun logDoneWaitingUntilKeyguardVisible() {
- logBuffer.log(TAG, DEBUG, "done waiting for mWaitingUntilKeyguardVisible")
- }
-
- fun logUnoccludeAnimatorOnAnimationStart() {
- logBuffer.log(TAG, DEBUG, "UnoccludeAnimator#onAnimationStart. " +
- "Set occluded = false.")
- }
-
- fun logNoAppsProvidedToUnoccludeRunner() {
- logBuffer.log(TAG, DEBUG, "No apps provided to unocclude runner; " +
- "skipping animation and unoccluding.")
- }
-
- fun logReceivedDelayedKeyguardAction(sequence: Int, delayedShowingSequence: Int) {
- logBuffer.log(
- TAG,
- DEBUG,
- {
- int1 = sequence
- int2 = delayedShowingSequence
- },
- {
- "received DELAYED_KEYGUARD_ACTION with seq = $int1 " +
- "mDelayedShowingSequence = $int2"
- }
- )
- }
-
- fun logTimeoutWhileActivityDrawn() {
- logBuffer.log(TAG, WARNING, "Timeout while waiting for activity drawn")
- }
-
- fun logTryKeyguardDonePending(
- keyguardDonePending: Boolean,
- hideAnimationRun: Boolean,
- hideAnimationRunning: Boolean
- ) {
- logBuffer.log(TAG, DEBUG,
- {
- bool1 = keyguardDonePending
- bool2 = hideAnimationRun
- bool3 = hideAnimationRunning
- },
- { "tryKeyguardDone: pending - $bool1, animRan - $bool2 animRunning - $bool3" }
- )
- }
-
- fun logTryKeyguardDonePreHideAnimation() {
- logBuffer.log(TAG, DEBUG, "tryKeyguardDone: starting pre-hide animation")
- }
-
- fun logHandleKeyguardDone() {
- logBuffer.log(TAG, DEBUG, "handleKeyguardDone")
- }
-
- fun logDeviceGoingToSleep() {
- logBuffer.log(TAG, INFO, "Device is going to sleep, aborting keyguardDone")
- }
-
- fun logFailedToCallOnKeyguardExitResultTrue(remoteException: RemoteException) {
- logBuffer.log(
- TAG,
- WARNING,
- "Failed to call onKeyguardExitResult(true)",
- remoteException
- )
- }
-
- fun logHandleKeyguardDoneDrawing() {
- logBuffer.log(TAG, DEBUG, "handleKeyguardDoneDrawing")
- }
-
- fun logHandleKeyguardDoneDrawingNotifyingKeyguardVisible() {
- logBuffer.log(TAG, DEBUG, "handleKeyguardDoneDrawing: notifying " +
- "mWaitingUntilKeyguardVisible")
- }
-
- fun logUpdateActivityLockScreenState(showing: Boolean, aodShowing: Boolean) {
- logBuffer.log(
- TAG,
- DEBUG,
- {
- bool1 = showing
- bool2 = aodShowing
- },
- { "updateActivityLockScreenState($bool1, $bool2)" }
- )
- }
-
- fun logFailedToCallSetLockScreenShown(remoteException: RemoteException) {
- logBuffer.log(
- TAG,
- WARNING,
- "Failed to call setLockScreenShown",
- remoteException
- )
- }
-
- fun logKeyguardGoingAway() {
- logBuffer.log(TAG, DEBUG, "keyguardGoingAway")
- }
-
- fun logFailedToCallKeyguardGoingAway(keyguardFlag: Int, remoteException: RemoteException) {
- logBuffer.log(
- TAG,
- ERROR,
- { int1 = keyguardFlag },
- { "Failed to call keyguardGoingAway($int1)" },
- remoteException
- )
- }
-
- fun logHideAnimationFinishedRunnable() {
- logBuffer.log(TAG, WARNING, "mHideAnimationFinishedRunnable#run")
- }
-
- fun logFailedToCallOnAnimationFinished(remoteException: RemoteException) {
- logBuffer.log(
- TAG,
- WARNING,
- "Failed to call onAnimationFinished",
- remoteException
- )
- }
-
- fun logFailedToCallOnAnimationStart(remoteException: RemoteException) {
- logBuffer.log(
- TAG,
- WARNING,
- "Failed to call onAnimationStart",
- remoteException
- )
- }
-
- fun logOnKeyguardExitRemoteAnimationFinished() {
- logBuffer.log(TAG, DEBUG, "onKeyguardExitRemoteAnimationFinished")
- }
-
- fun logSkipOnKeyguardExitRemoteAnimationFinished(
- cancelled: Boolean,
- surfaceBehindRemoteAnimationRunning: Boolean,
- surfaceBehindRemoteAnimationRequested: Boolean
- ) {
- logBuffer.log(
- TAG,
- DEBUG,
- {
- bool1 = cancelled
- bool2 = surfaceBehindRemoteAnimationRunning
- bool3 = surfaceBehindRemoteAnimationRequested
- },
- {
- "skip onKeyguardExitRemoteAnimationFinished cancelled=$bool1 " +
- "surfaceAnimationRunning=$bool2 " +
- "surfaceAnimationRequested=$bool3"
- }
- )
- }
-
- fun logOnKeyguardExitRemoteAnimationFinishedHideKeyguardView() {
- logBuffer.log(TAG, DEBUG, "onKeyguardExitRemoteAnimationFinished" +
- "#hideKeyguardViewAfterRemoteAnimation")
- }
-
- fun logSkipHideKeyguardViewAfterRemoteAnimation(
- dismissingFromSwipe: Boolean,
- wasShowing: Boolean
- ) {
- logBuffer.log(
- TAG,
- DEBUG,
- {
- bool1 = dismissingFromSwipe
- bool2 = wasShowing
- },
- {
- "skip hideKeyguardViewAfterRemoteAnimation dismissFromSwipe=$bool1 " +
- "wasShowing=$bool2"
- }
- )
- }
-
- fun logCouldNotGetStatusBarManager() {
- logBuffer.log(TAG, WARNING, "Could not get status bar manager")
- }
-
- fun logAdjustStatusBarLocked(
- showing: Boolean,
- occluded: Boolean,
- secure: Boolean,
- forceHideHomeRecentsButtons: Boolean,
- flags: String
- ) {
- logBuffer.log(
- TAG,
- DEBUG,
- {
- bool1 = showing
- bool2 = occluded
- bool3 = secure
- bool4 = forceHideHomeRecentsButtons
- str3 = flags
- },
- {
- "adjustStatusBarLocked: mShowing=$bool1 mOccluded=$bool2 isSecure=$bool3 " +
- "force=$bool4 --> flags=0x$str3"
- }
- )
- }
-
- fun logFailedToCallOnShowingStateChanged(remoteException: RemoteException) {
- logBuffer.log(
- TAG,
- WARNING,
- "Failed to call onShowingStateChanged",
- remoteException
- )
- }
-
- fun logFailedToCallNotifyTrustedChangedLocked(remoteException: RemoteException) {
- logBuffer.log(
- TAG,
- WARNING,
- "Failed to call notifyTrustedChangedLocked",
- remoteException
- )
- }
-
- fun logFailedToCallIKeyguardStateCallback(remoteException: RemoteException) {
- logBuffer.log(
- TAG,
- WARNING,
- "Failed to call to IKeyguardStateCallback",
- remoteException
- )
- }
-
- fun logOccludeAnimatorOnAnimationStart() {
- logBuffer.log(TAG, DEBUG, "OccludeAnimator#onAnimationStart. Set occluded = true.")
- }
-
- fun logOccludeAnimationCancelledByWm(isKeyguardOccluded: Boolean) {
- logBuffer.log(
- TAG,
- DEBUG,
- { bool1 = isKeyguardOccluded },
- { "Occlude animation cancelled by WM. Setting occluded state to: $bool1" }
- )
- }
-}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 70e0d5f..2c60d5d 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -73,6 +73,8 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.util.EventLog;
+import android.util.Log;
+import android.util.Slog;
import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
import android.view.IRemoteAnimationFinishedCallback;
@@ -104,7 +106,6 @@
import com.android.keyguard.KeyguardUpdateMonitorCallback;
import com.android.keyguard.KeyguardViewController;
import com.android.keyguard.ViewMediatorCallback;
-import com.android.keyguard.logging.KeyguardViewMediatorLogger;
import com.android.keyguard.mediator.ScreenOnCoordinator;
import com.android.systemui.CoreStartable;
import com.android.systemui.DejankUtils;
@@ -512,7 +513,8 @@
public void onKeyguardVisibilityChanged(boolean showing) {
synchronized (KeyguardViewMediator.this) {
if (!showing && mPendingPinLock) {
- mLogger.logPinLockRequestedStartingKeyguard();
+ Log.i(TAG, "PIN lock requested, starting keyguard");
+
// Bring the keyguard back in order to show the PIN lock
mPendingPinLock = false;
doKeyguardLocked(null);
@@ -522,7 +524,7 @@
@Override
public void onUserSwitching(int userId) {
- mLogger.logUserSwitching(userId);
+ if (DEBUG) Log.d(TAG, String.format("onUserSwitching %d", userId));
// Note that the mLockPatternUtils user has already been updated from setCurrentUser.
// We need to force a reset of the views, since lockNow (called by
// ActivityManagerService) will not reconstruct the keyguard if it is already showing.
@@ -540,7 +542,7 @@
@Override
public void onUserSwitchComplete(int userId) {
- mLogger.logOnUserSwitchComplete(userId);
+ if (DEBUG) Log.d(TAG, String.format("onUserSwitchComplete %d", userId));
if (userId != UserHandle.USER_SYSTEM) {
UserInfo info = UserManager.get(mContext).getUserInfo(userId);
// Don't try to dismiss if the user has Pin/Pattern/Password set
@@ -568,7 +570,8 @@
public void onSimStateChanged(int subId, int slotId, int simState) {
if (DEBUG_SIM_STATES) {
- mLogger.logOnSimStateChanged(subId, slotId, String.valueOf(simState));
+ Log.d(TAG, "onSimStateChanged(subId=" + subId + ", slotId=" + slotId
+ + ",state=" + simState + ")");
}
int size = mKeyguardStateCallbacks.size();
@@ -577,7 +580,7 @@
try {
mKeyguardStateCallbacks.get(i).onSimSecureStateChanged(simPinSecure);
} catch (RemoteException e) {
- mLogger.logFailedToCallOnSimSecureStateChanged(e);
+ Slog.w(TAG, "Failed to call onSimSecureStateChanged", e);
if (e instanceof DeadObjectException) {
mKeyguardStateCallbacks.remove(i);
}
@@ -600,9 +603,9 @@
synchronized (KeyguardViewMediator.this) {
if (shouldWaitForProvisioning()) {
if (!mShowing) {
- if (DEBUG_SIM_STATES) {
- mLogger.logIccAbsentIsNotShowing();
- }
+ if (DEBUG_SIM_STATES) Log.d(TAG, "ICC_ABSENT isn't showing,"
+ + " we need to show the keyguard since the "
+ + "device isn't provisioned yet.");
doKeyguardLocked(null);
} else {
resetStateLocked();
@@ -612,9 +615,8 @@
// MVNO SIMs can become transiently NOT_READY when switching networks,
// so we should only lock when they are ABSENT.
if (lastSimStateWasLocked) {
- if (DEBUG_SIM_STATES) {
- mLogger.logSimMovedToAbsent();
- }
+ if (DEBUG_SIM_STATES) Log.d(TAG, "SIM moved to ABSENT when the "
+ + "previous state was locked. Reset the state.");
resetStateLocked();
}
mSimWasLocked.append(slotId, false);
@@ -627,9 +629,9 @@
mSimWasLocked.append(slotId, true);
mPendingPinLock = true;
if (!mShowing) {
- if (DEBUG_SIM_STATES) {
- mLogger.logIntentValueIccLocked();
- }
+ if (DEBUG_SIM_STATES) Log.d(TAG,
+ "INTENT_VALUE_ICC_LOCKED and keygaurd isn't "
+ + "showing; need to show keyguard so user can enter sim pin");
doKeyguardLocked(null);
} else {
resetStateLocked();
@@ -639,36 +641,29 @@
case TelephonyManager.SIM_STATE_PERM_DISABLED:
synchronized (KeyguardViewMediator.this) {
if (!mShowing) {
- if (DEBUG_SIM_STATES) {
- mLogger.logPermDisabledKeyguardNotShowing();
- }
+ if (DEBUG_SIM_STATES) Log.d(TAG, "PERM_DISABLED and "
+ + "keygaurd isn't showing.");
doKeyguardLocked(null);
} else {
- if (DEBUG_SIM_STATES) {
- mLogger.logPermDisabledResetStateLocked();
- }
+ if (DEBUG_SIM_STATES) Log.d(TAG, "PERM_DISABLED, resetStateLocked to"
+ + "show permanently disabled message in lockscreen.");
resetStateLocked();
}
}
break;
case TelephonyManager.SIM_STATE_READY:
synchronized (KeyguardViewMediator.this) {
- if (DEBUG_SIM_STATES) {
- mLogger.logReadyResetState(mShowing);
- }
+ if (DEBUG_SIM_STATES) Log.d(TAG, "READY, reset state? " + mShowing);
if (mShowing && mSimWasLocked.get(slotId, false)) {
- if (DEBUG_SIM_STATES) {
- mLogger.logSimMovedToReady();
- }
+ if (DEBUG_SIM_STATES) Log.d(TAG, "SIM moved to READY when the "
+ + "previously was locked. Reset the state.");
mSimWasLocked.append(slotId, false);
resetStateLocked();
}
}
break;
default:
- if (DEBUG_SIM_STATES) {
- mLogger.logUnspecifiedSimState(simState);
- }
+ if (DEBUG_SIM_STATES) Log.v(TAG, "Unspecific state: " + simState);
break;
}
}
@@ -713,7 +708,7 @@
if (targetUserId != ActivityManager.getCurrentUser()) {
return;
}
- mLogger.logKeyguardDone();
+ if (DEBUG) Log.d(TAG, "keyguardDone");
tryKeyguardDone();
}
@@ -732,7 +727,7 @@
@Override
public void keyguardDonePending(boolean strongAuth, int targetUserId) {
Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardDonePending");
- mLogger.logKeyguardDonePending();
+ if (DEBUG) Log.d(TAG, "keyguardDonePending");
if (targetUserId != ActivityManager.getCurrentUser()) {
Trace.endSection();
return;
@@ -751,7 +746,7 @@
@Override
public void keyguardGone() {
Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardGone");
- mLogger.logKeyguardGone();
+ if (DEBUG) Log.d(TAG, "keyguardGone");
mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false);
mKeyguardDisplayManager.hide();
Trace.endSection();
@@ -837,7 +832,8 @@
@Override
public void onLaunchAnimationCancelled() {
- mLogger.logOccludeLaunchAnimationCancelled(mOccluded);
+ Log.d(TAG, "Occlude launch animation cancelled. Occluded state is now: "
+ + mOccluded);
}
@Override
@@ -857,7 +853,8 @@
@Override
public void setLaunchContainer(@NonNull ViewGroup launchContainer) {
// No-op, launch container is always the shade.
- mLogger.logActivityLaunchAnimatorLaunchContainerChanged();
+ Log.wtf(TAG, "Someone tried to change the launch container for the "
+ + "ActivityLaunchAnimator, which should never happen.");
}
@NonNull
@@ -908,7 +905,8 @@
}
setOccluded(isKeyguardOccluded /* isOccluded */, false /* animate */);
- mLogger.logUnoccludeAnimationCancelled(mOccluded);
+ Log.d(TAG, "Unocclude animation cancelled. Occluded state is now: "
+ + mOccluded);
}
@Override
@@ -916,11 +914,12 @@
RemoteAnimationTarget[] wallpapers,
RemoteAnimationTarget[] nonApps,
IRemoteAnimationFinishedCallback finishedCallback) throws RemoteException {
- mLogger.logUnoccludeAnimatorOnAnimationStart();
+ Log.d(TAG, "UnoccludeAnimator#onAnimationStart. Set occluded = false.");
setOccluded(false /* isOccluded */, true /* animate */);
if (apps == null || apps.length == 0 || apps[0] == null) {
- mLogger.logNoAppsProvidedToUnoccludeRunner();
+ Log.d(TAG, "No apps provided to unocclude runner; "
+ + "skipping animation and unoccluding.");
finishedCallback.onAnimationFinished();
return;
}
@@ -1008,7 +1007,6 @@
private ScreenOnCoordinator mScreenOnCoordinator;
private Lazy<ActivityLaunchAnimator> mActivityLaunchAnimator;
- private KeyguardViewMediatorLogger mLogger;
/**
* Injected constructor. See {@link KeyguardModule}.
@@ -1037,8 +1035,7 @@
InteractionJankMonitor interactionJankMonitor,
DreamOverlayStateController dreamOverlayStateController,
Lazy<NotificationShadeWindowController> notificationShadeWindowControllerLazy,
- Lazy<ActivityLaunchAnimator> activityLaunchAnimator,
- KeyguardViewMediatorLogger logger) {
+ Lazy<ActivityLaunchAnimator> activityLaunchAnimator) {
super(context);
mFalsingCollector = falsingCollector;
mLockPatternUtils = lockPatternUtils;
@@ -1081,7 +1078,6 @@
mDreamOverlayStateController = dreamOverlayStateController;
mActivityLaunchAnimator = activityLaunchAnimator;
- mLogger = logger;
mPowerButtonY = context.getResources().getDimensionPixelSize(
R.dimen.physical_power_button_center_screen_location_y);
@@ -1145,21 +1141,21 @@
mLockSoundId = mLockSounds.load(soundPath, 1);
}
if (soundPath == null || mLockSoundId == 0) {
- mLogger.logFailedLoadLockSound(soundPath);
+ Log.w(TAG, "failed to load lock sound from " + soundPath);
}
soundPath = Settings.Global.getString(cr, Settings.Global.UNLOCK_SOUND);
if (soundPath != null) {
mUnlockSoundId = mLockSounds.load(soundPath, 1);
}
if (soundPath == null || mUnlockSoundId == 0) {
- mLogger.logFailedLoadUnlockSound(soundPath);
+ Log.w(TAG, "failed to load unlock sound from " + soundPath);
}
soundPath = Settings.Global.getString(cr, Settings.Global.TRUSTED_SOUND);
if (soundPath != null) {
mTrustedSoundId = mLockSounds.load(soundPath, 1);
}
if (soundPath == null || mTrustedSoundId == 0) {
- mLogger.logFailedLoadTrustedSound(soundPath);
+ Log.w(TAG, "failed to load trusted sound from " + soundPath);
}
int lockSoundDefaultAttenuation = mContext.getResources().getInteger(
@@ -1188,7 +1184,7 @@
private void handleSystemReady() {
synchronized (this) {
- mLogger.logOnSystemReady();
+ if (DEBUG) Log.d(TAG, "onSystemReady");
mSystemReady = true;
doKeyguardLocked(null);
mUpdateMonitor.registerCallback(mUpdateCallback);
@@ -1206,7 +1202,7 @@
* {@link WindowManagerPolicyConstants#OFF_BECAUSE_OF_TIMEOUT}.
*/
public void onStartedGoingToSleep(@WindowManagerPolicyConstants.OffReason int offReason) {
- mLogger.logOnStartedGoingToSleep(offReason);
+ if (DEBUG) Log.d(TAG, "onStartedGoingToSleep(" + offReason + ")");
synchronized (this) {
mDeviceInteractive = false;
mPowerGestureIntercepted = false;
@@ -1222,11 +1218,11 @@
long timeout = getLockTimeout(KeyguardUpdateMonitor.getCurrentUser());
mLockLater = false;
if (mExitSecureCallback != null) {
- mLogger.logPendingExitSecureCallbackCancelled();
+ if (DEBUG) Log.d(TAG, "pending exit secure callback cancelled");
try {
mExitSecureCallback.onKeyguardExitResult(false);
} catch (RemoteException e) {
- mLogger.logFailedOnKeyguardExitResultFalse(e);
+ Slog.w(TAG, "Failed to call onKeyguardExitResult(false)", e);
}
mExitSecureCallback = null;
if (!mExternallyEnabled) {
@@ -1271,7 +1267,7 @@
*/
public void onFinishedGoingToSleep(
@WindowManagerPolicyConstants.OffReason int offReason, boolean cameraGestureTriggered) {
- mLogger.logOnFinishedGoingToSleep(offReason);
+ if (DEBUG) Log.d(TAG, "onFinishedGoingToSleep(" + offReason + ")");
synchronized (this) {
mDeviceInteractive = false;
mGoingToSleep = false;
@@ -1329,7 +1325,13 @@
// - The screen off animation is cancelled by the device waking back up. We will call
// maybeHandlePendingLock from KeyguardViewMediator#onStartedWakingUp.
if (mScreenOffAnimationController.isKeyguardShowDelayed()) {
- mLogger.logMaybeHandlePendingLockNotHandling();
+ if (DEBUG) {
+ Log.d(TAG, "#maybeHandlePendingLock: not handling because the screen off "
+ + "animation's isKeyguardShowDelayed() returned true. This should be "
+ + "handled soon by #onStartedWakingUp, or by the end actions of the "
+ + "screen off animation.");
+ }
+
return;
}
@@ -1339,11 +1341,18 @@
// StatusBar#finishKeyguardFadingAway, which is always responsible for setting
// isKeyguardGoingAway to false.
if (mKeyguardStateController.isKeyguardGoingAway()) {
- mLogger.logMaybeHandlePendingLockKeyguardGoingAway();
+ if (DEBUG) {
+ Log.d(TAG, "#maybeHandlePendingLock: not handling because the keyguard is "
+ + "going away. This should be handled shortly by "
+ + "StatusBar#finishKeyguardFadingAway.");
+ }
+
return;
}
- mLogger.logMaybeHandlePendingLockHandling();
+ if (DEBUG) {
+ Log.d(TAG, "#maybeHandlePendingLock: handling pending lock; locking keyguard.");
+ }
doKeyguardLocked(null);
setPendingLock(false);
@@ -1412,7 +1421,8 @@
PendingIntent sender = PendingIntent.getBroadcast(mContext,
0, intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
mAlarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, when, sender);
- mLogger.logSetAlarmToTurnOffKeyguard(mDelayedShowingSequence);
+ if (DEBUG) Log.d(TAG, "setting alarm to turn off keyguard, seq = "
+ + mDelayedShowingSequence);
doKeyguardLaterForChildProfilesLocked();
}
@@ -1472,7 +1482,7 @@
mAnimatingScreenOff = false;
cancelDoKeyguardLaterLocked();
cancelDoKeyguardForChildProfilesLocked();
- mLogger.logOnStartedWakingUp(mDelayedShowingSequence);
+ if (DEBUG) Log.d(TAG, "onStartedWakingUp, seq = " + mDelayedShowingSequence);
notifyStartedWakingUp();
}
mUpdateMonitor.dispatchStartedWakingUp();
@@ -1532,35 +1542,37 @@
*/
public void setKeyguardEnabled(boolean enabled) {
synchronized (this) {
- mLogger.logSetKeyguardEnabled(enabled);
+ if (DEBUG) Log.d(TAG, "setKeyguardEnabled(" + enabled + ")");
mExternallyEnabled = enabled;
if (!enabled && mShowing) {
if (mExitSecureCallback != null) {
- mLogger.logIgnoreVerifyUnlockRequest();
+ if (DEBUG) Log.d(TAG, "in process of verifyUnlock request, ignoring");
// we're in the process of handling a request to verify the user
// can get past the keyguard. ignore extraneous requests to disable / re-enable
return;
}
// hiding keyguard that is showing, remember to reshow later
- mLogger.logRememberToReshowLater();
+ if (DEBUG) Log.d(TAG, "remembering to reshow, hiding keyguard, "
+ + "disabling status bar expansion");
mNeedToReshowWhenReenabled = true;
updateInputRestrictedLocked();
hideLocked();
} else if (enabled && mNeedToReshowWhenReenabled) {
// re-enabled after previously hidden, reshow
- mLogger.logPreviouslyHiddenReshow();
+ if (DEBUG) Log.d(TAG, "previously hidden, reshowing, reenabling "
+ + "status bar expansion");
mNeedToReshowWhenReenabled = false;
updateInputRestrictedLocked();
if (mExitSecureCallback != null) {
- mLogger.logOnKeyguardExitResultFalseResetting();
+ if (DEBUG) Log.d(TAG, "onKeyguardExitResult(false), resetting");
try {
mExitSecureCallback.onKeyguardExitResult(false);
} catch (RemoteException e) {
- mLogger.logFailedToCallOnKeyguardExitResultFalse(e);
+ Slog.w(TAG, "Failed to call onKeyguardExitResult(false)", e);
}
mExitSecureCallback = null;
resetStateLocked();
@@ -1572,7 +1584,7 @@
// and causing an ANR).
mWaitingUntilKeyguardVisible = true;
mHandler.sendEmptyMessageDelayed(KEYGUARD_DONE_DRAWING, KEYGUARD_DONE_DRAWING_TIMEOUT_MS);
- mLogger.logWaitingUntilKeyguardVisibleIsFalse();
+ if (DEBUG) Log.d(TAG, "waiting until mWaitingUntilKeyguardVisible is false");
while (mWaitingUntilKeyguardVisible) {
try {
wait();
@@ -1580,7 +1592,7 @@
Thread.currentThread().interrupt();
}
}
- mLogger.logDoneWaitingUntilKeyguardVisible();
+ if (DEBUG) Log.d(TAG, "done waiting for mWaitingUntilKeyguardVisible");
}
}
}
@@ -1592,31 +1604,31 @@
public void verifyUnlock(IKeyguardExitCallback callback) {
Trace.beginSection("KeyguardViewMediator#verifyUnlock");
synchronized (this) {
- mLogger.logVerifyUnlock();
+ if (DEBUG) Log.d(TAG, "verifyUnlock");
if (shouldWaitForProvisioning()) {
// don't allow this api when the device isn't provisioned
- mLogger.logIgnoreUnlockDeviceNotProvisioned();
+ if (DEBUG) Log.d(TAG, "ignoring because device isn't provisioned");
try {
callback.onKeyguardExitResult(false);
} catch (RemoteException e) {
- mLogger.logFailedToCallOnKeyguardExitResultFalse(e);
+ Slog.w(TAG, "Failed to call onKeyguardExitResult(false)", e);
}
} else if (mExternallyEnabled) {
// this only applies when the user has externally disabled the
// keyguard. this is unexpected and means the user is not
// using the api properly.
- mLogger.logVerifyUnlockCalledNotExternallyDisabled();
+ Log.w(TAG, "verifyUnlock called when not externally disabled");
try {
callback.onKeyguardExitResult(false);
} catch (RemoteException e) {
- mLogger.logFailedToCallOnKeyguardExitResultFalse(e);
+ Slog.w(TAG, "Failed to call onKeyguardExitResult(false)", e);
}
} else if (mExitSecureCallback != null) {
// already in progress with someone else
try {
callback.onKeyguardExitResult(false);
} catch (RemoteException e) {
- mLogger.logFailedToCallOnKeyguardExitResultFalse(e);
+ Slog.w(TAG, "Failed to call onKeyguardExitResult(false)", e);
}
} else if (!isSecure()) {
@@ -1628,7 +1640,7 @@
try {
callback.onKeyguardExitResult(true);
} catch (RemoteException e) {
- mLogger.logFailedToCallOnKeyguardExitResultFalse(e);
+ Slog.w(TAG, "Failed to call onKeyguardExitResult(false)", e);
}
} else {
@@ -1637,7 +1649,7 @@
try {
callback.onKeyguardExitResult(false);
} catch (RemoteException e) {
- mLogger.logFailedToCallOnKeyguardExitResultFalse(e);
+ Slog.w(TAG, "Failed to call onKeyguardExitResult(false)", e);
}
}
}
@@ -1655,8 +1667,10 @@
* Notify us when the keyguard is occluded by another window
*/
public void setOccluded(boolean isOccluded, boolean animate) {
+ Log.d(TAG, "setOccluded(" + isOccluded + ")");
+
Trace.beginSection("KeyguardViewMediator#setOccluded");
- mLogger.logSetOccluded(isOccluded);
+ if (DEBUG) Log.d(TAG, "setOccluded " + isOccluded);
mInteractionJankMonitor.cancel(CUJ_LOCKSCREEN_TRANSITION_FROM_AOD);
mHandler.removeMessages(SET_OCCLUDED);
Message msg = mHandler.obtainMessage(SET_OCCLUDED, isOccluded ? 1 : 0, animate ? 1 : 0);
@@ -1685,7 +1699,7 @@
*/
private void handleSetOccluded(boolean isOccluded, boolean animate) {
Trace.beginSection("KeyguardViewMediator#handleSetOccluded");
- mLogger.logHandleSetOccluded(isOccluded);
+ Log.d(TAG, "handleSetOccluded(" + isOccluded + ")");
synchronized (KeyguardViewMediator.this) {
if (mHiding && isOccluded) {
// We're in the process of going away but WindowManager wants to show a
@@ -1742,7 +1756,7 @@
try {
callback.onInputRestrictedStateChanged(inputRestricted);
} catch (RemoteException e) {
- mLogger.logFailedToCallOnDeviceProvisioned(e);
+ Slog.w(TAG, "Failed to call onDeviceProvisioned", e);
if (e instanceof DeadObjectException) {
mKeyguardStateCallbacks.remove(callback);
}
@@ -1757,7 +1771,8 @@
private void doKeyguardLocked(Bundle options) {
// if another app is disabling us, don't show
if (!mExternallyEnabled) {
- mLogger.logDoKeyguardNotShowingExternallyDisabled();
+ if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled");
+
mNeedToReshowWhenReenabled = true;
return;
}
@@ -1766,7 +1781,7 @@
// to account for the hiding animation which results in a delay and discrepancy
// between flags
if (mShowing && mKeyguardViewControllerLazy.get().isShowing()) {
- mLogger.logDoKeyguardNotShowingAlreadyShowing();
+ if (DEBUG) Log.d(TAG, "doKeyguard: not showing because it is already showing");
resetStateLocked();
return;
}
@@ -1785,19 +1800,20 @@
|| ((absent || disabled) && requireSim);
if (!lockedOrMissing && shouldWaitForProvisioning()) {
- mLogger.logDoKeyguardNotShowingDeviceNotProvisioned();
+ if (DEBUG) Log.d(TAG, "doKeyguard: not showing because device isn't provisioned"
+ + " and the sim is not locked or missing");
return;
}
boolean forceShow = options != null && options.getBoolean(OPTION_FORCE_SHOW, false);
if (mLockPatternUtils.isLockScreenDisabled(KeyguardUpdateMonitor.getCurrentUser())
&& !lockedOrMissing && !forceShow) {
- mLogger.logDoKeyguardNotShowingLockScreenOff();
+ if (DEBUG) Log.d(TAG, "doKeyguard: not showing because lockscreen is off");
return;
}
}
- mLogger.logDoKeyguardShowingLockScreen();
+ if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen");
showLocked(options);
}
@@ -1835,23 +1851,32 @@
* @see #handleReset
*/
private void resetStateLocked() {
- mLogger.logResetStateLocked();
+ if (DEBUG) Log.e(TAG, "resetStateLocked");
Message msg = mHandler.obtainMessage(RESET);
mHandler.sendMessage(msg);
}
+ /**
+ * Send message to keyguard telling it to verify unlock
+ * @see #handleVerifyUnlock()
+ */
+ private void verifyUnlockLocked() {
+ if (DEBUG) Log.d(TAG, "verifyUnlockLocked");
+ mHandler.sendEmptyMessage(VERIFY_UNLOCK);
+ }
+
private void notifyStartedGoingToSleep() {
- mLogger.logNotifyStartedGoingToSleep();
+ if (DEBUG) Log.d(TAG, "notifyStartedGoingToSleep");
mHandler.sendEmptyMessage(NOTIFY_STARTED_GOING_TO_SLEEP);
}
private void notifyFinishedGoingToSleep() {
- mLogger.logNotifyFinishedGoingToSleep();
+ if (DEBUG) Log.d(TAG, "notifyFinishedGoingToSleep");
mHandler.sendEmptyMessage(NOTIFY_FINISHED_GOING_TO_SLEEP);
}
private void notifyStartedWakingUp() {
- mLogger.logNotifyStartedWakingUp();
+ if (DEBUG) Log.d(TAG, "notifyStartedWakingUp");
mHandler.sendEmptyMessage(NOTIFY_STARTED_WAKING_UP);
}
@@ -1861,7 +1886,7 @@
*/
private void showLocked(Bundle options) {
Trace.beginSection("KeyguardViewMediator#showLocked acquiring mShowKeyguardWakeLock");
- mLogger.logShowLocked();
+ if (DEBUG) Log.d(TAG, "showLocked");
// ensure we stay awake until we are finished displaying the keyguard
mShowKeyguardWakeLock.acquire();
Message msg = mHandler.obtainMessage(SHOW, options);
@@ -1878,7 +1903,7 @@
*/
private void hideLocked() {
Trace.beginSection("KeyguardViewMediator#hideLocked");
- mLogger.logHideLocked();
+ if (DEBUG) Log.d(TAG, "hideLocked");
Message msg = mHandler.obtainMessage(HIDE);
mHandler.sendMessage(msg);
Trace.endSection();
@@ -1957,7 +1982,8 @@
public void onReceive(Context context, Intent intent) {
if (DELAYED_KEYGUARD_ACTION.equals(intent.getAction())) {
final int sequence = intent.getIntExtra("seq", 0);
- mLogger.logReceivedDelayedKeyguardAction(sequence, mDelayedShowingSequence);
+ if (DEBUG) Log.d(TAG, "received DELAYED_KEYGUARD_ACTION with seq = "
+ + sequence + ", mDelayedShowingSequence = " + mDelayedShowingSequence);
synchronized (KeyguardViewMediator.this) {
if (mDelayedShowingSequence == sequence) {
doKeyguardLocked(null);
@@ -1990,7 +2016,7 @@
private void keyguardDone() {
Trace.beginSection("KeyguardViewMediator#keyguardDone");
- mLogger.logKeyguardDone();
+ if (DEBUG) Log.d(TAG, "keyguardDone()");
userActivity();
EventLog.writeEvent(70000, 2);
Message msg = mHandler.obtainMessage(KEYGUARD_DONE);
@@ -2082,7 +2108,7 @@
case KEYGUARD_DONE_PENDING_TIMEOUT:
Trace.beginSection("KeyguardViewMediator#handleMessage"
+ " KEYGUARD_DONE_PENDING_TIMEOUT");
- mLogger.logTimeoutWhileActivityDrawn();
+ Log.w(TAG, "Timeout while waiting for activity drawn!");
Trace.endSection();
break;
case SYSTEM_READY:
@@ -2093,15 +2119,14 @@
};
private void tryKeyguardDone() {
- mLogger.logTryKeyguardDonePending(
- mKeyguardDonePending,
- mHideAnimationRun,
- mHideAnimationRunning
- );
+ if (DEBUG) {
+ Log.d(TAG, "tryKeyguardDone: pending - " + mKeyguardDonePending + ", animRan - "
+ + mHideAnimationRun + " animRunning - " + mHideAnimationRunning);
+ }
if (!mKeyguardDonePending && mHideAnimationRun && !mHideAnimationRunning) {
handleKeyguardDone();
} else if (!mHideAnimationRun) {
- mLogger.logTryKeyguardDonePreHideAnimation();
+ if (DEBUG) Log.d(TAG, "tryKeyguardDone: starting pre-hide animation");
mHideAnimationRun = true;
mHideAnimationRunning = true;
mKeyguardViewControllerLazy.get()
@@ -2121,14 +2146,14 @@
mLockPatternUtils.getDevicePolicyManager().reportKeyguardDismissed(currentUser);
}
});
- mLogger.logHandleKeyguardDone();
+ if (DEBUG) Log.d(TAG, "handleKeyguardDone");
synchronized (this) {
resetKeyguardDonePendingLocked();
}
if (mGoingToSleep) {
mUpdateMonitor.clearBiometricRecognizedWhenKeyguardDone(currentUser);
- mLogger.logDeviceGoingToSleep();
+ Log.i(TAG, "Device is going to sleep, aborting keyguardDone");
return;
}
setPendingLock(false); // user may have authenticated during the screen off animation
@@ -2136,7 +2161,7 @@
try {
mExitSecureCallback.onKeyguardExitResult(true /* authenciated */);
} catch (RemoteException e) {
- mLogger.logFailedToCallOnKeyguardExitResultTrue(e);
+ Slog.w(TAG, "Failed to call onKeyguardExitResult()", e);
}
mExitSecureCallback = null;
@@ -2179,9 +2204,9 @@
private void handleKeyguardDoneDrawing() {
Trace.beginSection("KeyguardViewMediator#handleKeyguardDoneDrawing");
synchronized(this) {
- mLogger.logHandleKeyguardDoneDrawing();
+ if (DEBUG) Log.d(TAG, "handleKeyguardDoneDrawing");
if (mWaitingUntilKeyguardVisible) {
- mLogger.logHandleKeyguardDoneDrawingNotifyingKeyguardVisible();
+ if (DEBUG) Log.d(TAG, "handleKeyguardDoneDrawing: notifying mWaitingUntilKeyguardVisible");
mWaitingUntilKeyguardVisible = false;
notifyAll();
@@ -2231,11 +2256,12 @@
private void updateActivityLockScreenState(boolean showing, boolean aodShowing) {
mUiBgExecutor.execute(() -> {
- mLogger.logUpdateActivityLockScreenState(showing, aodShowing);
+ if (DEBUG) {
+ Log.d(TAG, "updateActivityLockScreenState(" + showing + ", " + aodShowing + ")");
+ }
try {
ActivityTaskManager.getService().setLockScreenShown(showing, aodShowing);
} catch (RemoteException e) {
- mLogger.logFailedToCallSetLockScreenShown(e);
}
});
}
@@ -2252,10 +2278,10 @@
}
synchronized (KeyguardViewMediator.this) {
if (!mSystemReady) {
- mLogger.logIgnoreHandleShow();
+ if (DEBUG) Log.d(TAG, "ignoring handleShow because system is not ready.");
return;
} else {
- mLogger.logHandleShow();
+ if (DEBUG) Log.d(TAG, "handleShow");
}
mHiding = false;
@@ -2287,7 +2313,7 @@
@Override
public void run() {
Trace.beginSection("KeyguardViewMediator.mKeyGuardGoingAwayRunnable");
- mLogger.logKeyguardGoingAway();
+ if (DEBUG) Log.d(TAG, "keyguardGoingAway");
mKeyguardViewControllerLazy.get().keyguardGoingAway();
int flags = 0;
@@ -2331,7 +2357,7 @@
try {
ActivityTaskManager.getService().keyguardGoingAway(keyguardFlag);
} catch (RemoteException e) {
- mLogger.logFailedToCallKeyguardGoingAway(keyguardFlag, e);
+ Log.e(TAG, "Error while calling WindowManager", e);
}
});
Trace.endSection();
@@ -2339,7 +2365,7 @@
};
private final Runnable mHideAnimationFinishedRunnable = () -> {
- mLogger.logHideAnimationFinishedRunnable();
+ Log.e(TAG, "mHideAnimationFinishedRunnable#run");
mHideAnimationRunning = false;
tryKeyguardDone();
};
@@ -2359,14 +2385,14 @@
}
synchronized (KeyguardViewMediator.this) {
- mLogger.logHandleHide();
+ if (DEBUG) Log.d(TAG, "handleHide");
if (mustNotUnlockCurrentUser()) {
// In split system user mode, we never unlock system user. The end user has to
// switch to another user.
// TODO: We should stop it early by disabling the swipe up flow. Right now swipe up
// still completes and makes the screen blank.
- mLogger.logSplitSystemUserQuitUnlocking();
+ if (DEBUG) Log.d(TAG, "Split system user, quit unlocking.");
mKeyguardExitAnimationRunner = null;
return;
}
@@ -2398,7 +2424,8 @@
RemoteAnimationTarget[] apps, RemoteAnimationTarget[] wallpapers,
RemoteAnimationTarget[] nonApps, IRemoteAnimationFinishedCallback finishedCallback) {
Trace.beginSection("KeyguardViewMediator#handleStartKeyguardExitAnimation");
- mLogger.logHandleStartKeyguardExitAnimation(startTime, fadeoutDuration);
+ Log.d(TAG, "handleStartKeyguardExitAnimation startTime=" + startTime
+ + " fadeoutDuration=" + fadeoutDuration);
synchronized (KeyguardViewMediator.this) {
// Tell ActivityManager that we canceled the keyguard animation if
@@ -2414,7 +2441,7 @@
try {
finishedCallback.onAnimationFinished();
} catch (RemoteException e) {
- mLogger.logFailedToCallOnAnimationFinished(e);
+ Slog.w(TAG, "Failed to call onAnimationFinished", e);
}
}
setShowingLocked(mShowing, true /* force */);
@@ -2437,7 +2464,7 @@
try {
finishedCallback.onAnimationFinished();
} catch (RemoteException e) {
- mLogger.logFailedToCallOnAnimationFinished(e);
+ Slog.w(TAG, "Failed to call onAnimationFinished", e);
}
onKeyguardExitFinished();
mKeyguardViewControllerLazy.get().hide(0 /* startTime */,
@@ -2456,7 +2483,7 @@
runner.onAnimationStart(WindowManager.TRANSIT_KEYGUARD_GOING_AWAY, apps,
wallpapers, nonApps, callback);
} catch (RemoteException e) {
- mLogger.logFailedToCallOnAnimationStart(e);
+ Slog.w(TAG, "Failed to call onAnimationStart", e);
}
// When remaining on the shade, there's no need to do a fancy remote animation,
@@ -2520,7 +2547,7 @@
try {
finishedCallback.onAnimationFinished();
} catch (RemoteException e) {
- mLogger.logFailedToCallOnAnimationFinished(e);
+ Slog.e(TAG, "RemoteException");
} finally {
mInteractionJankMonitor.end(CUJ_LOCKSCREEN_UNLOCK_ANIMATION);
}
@@ -2531,7 +2558,7 @@
try {
finishedCallback.onAnimationFinished();
} catch (RemoteException e) {
- mLogger.logFailedToCallOnAnimationFinished(e);
+ Slog.e(TAG, "RemoteException");
} finally {
mInteractionJankMonitor.cancel(CUJ_LOCKSCREEN_UNLOCK_ANIMATION);
}
@@ -2600,9 +2627,11 @@
* @param cancelled {@code true} if the animation was cancelled before it finishes.
*/
public void onKeyguardExitRemoteAnimationFinished(boolean cancelled) {
- mLogger.logOnKeyguardExitRemoteAnimationFinished();
+ Log.d(TAG, "onKeyguardExitRemoteAnimationFinished");
if (!mSurfaceBehindRemoteAnimationRunning && !mSurfaceBehindRemoteAnimationRequested) {
- mLogger.logSkipOnKeyguardExitRemoteAnimationFinished(cancelled, false, false);
+ Log.d(TAG, "skip onKeyguardExitRemoteAnimationFinished cancelled=" + cancelled
+ + " surfaceAnimationRunning=" + mSurfaceBehindRemoteAnimationRunning
+ + " surfaceAnimationRequested=" + mSurfaceBehindRemoteAnimationRequested);
return;
}
@@ -2616,13 +2645,13 @@
onKeyguardExitFinished();
if (mKeyguardStateController.isDismissingFromSwipe() || wasShowing) {
- mLogger.logOnKeyguardExitRemoteAnimationFinishedHideKeyguardView();
+ Log.d(TAG, "onKeyguardExitRemoteAnimationFinished"
+ + "#hideKeyguardViewAfterRemoteAnimation");
mKeyguardUnlockAnimationControllerLazy.get().hideKeyguardViewAfterRemoteAnimation();
} else {
- mLogger.logSkipHideKeyguardViewAfterRemoteAnimation(
- mKeyguardStateController.isDismissingFromSwipe(),
- wasShowing
- );
+ Log.d(TAG, "skip hideKeyguardViewAfterRemoteAnimation"
+ + " dismissFromSwipe=" + mKeyguardStateController.isDismissingFromSwipe()
+ + " wasShowing=" + wasShowing);
}
finishSurfaceBehindRemoteAnimation(cancelled);
@@ -2719,7 +2748,7 @@
}
if (mStatusBarManager == null) {
- mLogger.logCouldNotGetStatusBarManager();
+ Log.w(TAG, "Could not get status bar manager");
} else {
// Disable aspects of the system/status/navigation bars that must not be re-enabled by
// windows that appear on top, ever
@@ -2737,13 +2766,12 @@
}
flags |= StatusBarManager.DISABLE_RECENT;
}
- mLogger.logAdjustStatusBarLocked(
- mShowing,
- mOccluded,
- isSecure(),
- forceHideHomeRecentsButtons,
- Integer.toHexString(flags)
- );
+
+ if (DEBUG) {
+ Log.d(TAG, "adjustStatusBarLocked: mShowing=" + mShowing + " mOccluded=" + mOccluded
+ + " isSecure=" + isSecure() + " force=" + forceHideHomeRecentsButtons
+ + " --> flags=0x" + Integer.toHexString(flags));
+ }
mStatusBarManager.disable(flags);
}
@@ -2755,7 +2783,7 @@
*/
private void handleReset() {
synchronized (KeyguardViewMediator.this) {
- mLogger.logHandleReset();
+ if (DEBUG) Log.d(TAG, "handleReset");
mKeyguardViewControllerLazy.get().reset(true /* hideBouncerWhenShowing */);
}
}
@@ -2767,7 +2795,7 @@
private void handleVerifyUnlock() {
Trace.beginSection("KeyguardViewMediator#handleVerifyUnlock");
synchronized (KeyguardViewMediator.this) {
- mLogger.logHandleVerifyUnlock();
+ if (DEBUG) Log.d(TAG, "handleVerifyUnlock");
setShowingLocked(true);
mKeyguardViewControllerLazy.get().dismissAndCollapse();
}
@@ -2776,7 +2804,7 @@
private void handleNotifyStartedGoingToSleep() {
synchronized (KeyguardViewMediator.this) {
- mLogger.logHandleNotifyStartedGoingToSleep();
+ if (DEBUG) Log.d(TAG, "handleNotifyStartedGoingToSleep");
mKeyguardViewControllerLazy.get().onStartedGoingToSleep();
}
}
@@ -2787,7 +2815,7 @@
*/
private void handleNotifyFinishedGoingToSleep() {
synchronized (KeyguardViewMediator.this) {
- mLogger.logHandleNotifyFinishedGoingToSleep();
+ if (DEBUG) Log.d(TAG, "handleNotifyFinishedGoingToSleep");
mKeyguardViewControllerLazy.get().onFinishedGoingToSleep();
}
}
@@ -2795,7 +2823,7 @@
private void handleNotifyStartedWakingUp() {
Trace.beginSection("KeyguardViewMediator#handleMotifyStartedWakingUp");
synchronized (KeyguardViewMediator.this) {
- mLogger.logHandleNotifyWakingUp();
+ if (DEBUG) Log.d(TAG, "handleNotifyWakingUp");
mKeyguardViewControllerLazy.get().onStartedWakingUp();
}
Trace.endSection();
@@ -3061,7 +3089,7 @@
try {
callback.onShowingStateChanged(showing, KeyguardUpdateMonitor.getCurrentUser());
} catch (RemoteException e) {
- mLogger.logFailedToCallOnShowingStateChanged(e);
+ Slog.w(TAG, "Failed to call onShowingStateChanged", e);
if (e instanceof DeadObjectException) {
mKeyguardStateCallbacks.remove(callback);
}
@@ -3080,7 +3108,7 @@
try {
mKeyguardStateCallbacks.get(i).onTrustedChanged(trusted);
} catch (RemoteException e) {
- mLogger.logFailedToCallNotifyTrustedChangedLocked(e);
+ Slog.w(TAG, "Failed to call notifyTrustedChangedLocked", e);
if (e instanceof DeadObjectException) {
mKeyguardStateCallbacks.remove(i);
}
@@ -3103,7 +3131,7 @@
callback.onTrustedChanged(mUpdateMonitor.getUserHasTrust(
KeyguardUpdateMonitor.getCurrentUser()));
} catch (RemoteException e) {
- mLogger.logFailedToCallIKeyguardStateCallback(e);
+ Slog.w(TAG, "Failed to call to IKeyguardStateCallback", e);
}
}
}
@@ -3180,7 +3208,7 @@
// internal state to reflect that immediately, vs. waiting for the launch animator to
// begin. Otherwise, calls to setShowingLocked, etc. will not know that we're about to
// be occluded and might re-show the keyguard.
- mLogger.logOccludeAnimatorOnAnimationStart();
+ Log.d(TAG, "OccludeAnimator#onAnimationStart. Set occluded = true.");
setOccluded(true /* isOccluded */, false /* animate */);
}
@@ -3188,7 +3216,8 @@
public void onAnimationCancelled(boolean isKeyguardOccluded) throws RemoteException {
super.onAnimationCancelled(isKeyguardOccluded);
- mLogger.logOccludeAnimationCancelledByWm(isKeyguardOccluded);
+ Log.d(TAG, "Occlude animation cancelled by WM. "
+ + "Setting occluded state to: " + isKeyguardOccluded);
setOccluded(isKeyguardOccluded /* occluded */, false /* animate */);
}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java
index fdea62d..56f1ac4 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java
@@ -30,7 +30,6 @@
import com.android.keyguard.dagger.KeyguardStatusBarViewComponent;
import com.android.keyguard.dagger.KeyguardStatusViewComponent;
import com.android.keyguard.dagger.KeyguardUserSwitcherComponent;
-import com.android.keyguard.logging.KeyguardViewMediatorLogger;
import com.android.keyguard.mediator.ScreenOnCoordinator;
import com.android.systemui.animation.ActivityLaunchAnimator;
import com.android.systemui.broadcast.BroadcastDispatcher;
@@ -106,8 +105,7 @@
InteractionJankMonitor interactionJankMonitor,
DreamOverlayStateController dreamOverlayStateController,
Lazy<NotificationShadeWindowController> notificationShadeWindowController,
- Lazy<ActivityLaunchAnimator> activityLaunchAnimator,
- KeyguardViewMediatorLogger logger) {
+ Lazy<ActivityLaunchAnimator> activityLaunchAnimator) {
return new KeyguardViewMediator(
context,
falsingCollector,
@@ -134,8 +132,7 @@
interactionJankMonitor,
dreamOverlayStateController,
notificationShadeWindowController,
- activityLaunchAnimator,
- logger);
+ activityLaunchAnimator);
}
/** */
diff --git a/packages/SystemUI/src/com/android/systemui/log/LogBuffer.kt b/packages/SystemUI/src/com/android/systemui/log/LogBuffer.kt
index 77ad806..6124e10 100644
--- a/packages/SystemUI/src/com/android/systemui/log/LogBuffer.kt
+++ b/packages/SystemUI/src/com/android/systemui/log/LogBuffer.kt
@@ -158,13 +158,8 @@
* add more detail to every log may do more to improve overall logging than adding more logs
* with this method.
*/
- fun log(
- tag: String,
- level: LogLevel,
- @CompileTimeConstant message: String,
- exception: Throwable? = null
- ) =
- log(tag, level, {str1 = message}, { str1!! }, exception)
+ fun log(tag: String, level: LogLevel, @CompileTimeConstant message: String) =
+ log(tag, level, {str1 = message}, { str1!! })
/**
* You should call [log] instead of this method.
diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/KeyguardUpdateMonitorLog.kt b/packages/SystemUI/src/com/android/systemui/log/dagger/KeyguardUpdateMonitorLog.kt
index 684839f..323ee21 100644
--- a/packages/SystemUI/src/com/android/systemui/log/dagger/KeyguardUpdateMonitorLog.kt
+++ b/packages/SystemUI/src/com/android/systemui/log/dagger/KeyguardUpdateMonitorLog.kt
@@ -1,7 +1,4 @@
package com.android.systemui.log.dagger
-import javax.inject.Qualifier
-
/** A [com.android.systemui.log.LogBuffer] for KeyguardUpdateMonitor. */
-@Qualifier
annotation class KeyguardUpdateMonitorLog
diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/KeyguardViewMediatorLog.kt b/packages/SystemUI/src/com/android/systemui/log/dagger/KeyguardViewMediatorLog.kt
deleted file mode 100644
index 88e227b..0000000
--- a/packages/SystemUI/src/com/android/systemui/log/dagger/KeyguardViewMediatorLog.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.log.dagger
-
-import javax.inject.Qualifier
-
-/** A [com.android.systemui.log.LogBuffer] for KeyguardViewMediator. */
-@Qualifier
-annotation class KeyguardViewMediatorLog
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java b/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java
index 9af42f8..c2a8764 100644
--- a/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java
+++ b/packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java
@@ -305,15 +305,4 @@
public static LogBuffer provideKeyguardUpdateMonitorLogBuffer(LogBufferFactory factory) {
return factory.create("KeyguardUpdateMonitorLog", 200);
}
-
- /**
- * Provides a {@link LogBuffer} for use by
- * {@link com.android.systemui.keyguard.KeyguardViewMediator}.
- */
- @Provides
- @SysUISingleton
- @KeyguardViewMediatorLog
- public static LogBuffer provideKeyguardViewMediatorLogBuffer(LogBufferFactory factory) {
- return factory.create("KeyguardViewMediatorLog", 100);
- }
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java
index 6e89bb9..21c018a 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java
@@ -48,7 +48,6 @@
import com.android.keyguard.KeyguardDisplayManager;
import com.android.keyguard.KeyguardSecurityView;
import com.android.keyguard.KeyguardUpdateMonitor;
-import com.android.keyguard.logging.KeyguardViewMediatorLogger;
import com.android.keyguard.mediator.ScreenOnCoordinator;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.animation.ActivityLaunchAnimator;
@@ -107,7 +106,6 @@
private @Mock Lazy<NotificationShadeWindowController> mNotificationShadeWindowControllerLazy;
private @Mock DreamOverlayStateController mDreamOverlayStateController;
private @Mock ActivityLaunchAnimator mActivityLaunchAnimator;
- private @Mock KeyguardViewMediatorLogger mLogger;
private DeviceConfigProxy mDeviceConfig = new DeviceConfigProxyFake();
private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock());
@@ -264,8 +262,7 @@
mInteractionJankMonitor,
mDreamOverlayStateController,
mNotificationShadeWindowControllerLazy,
- () -> mActivityLaunchAnimator,
- mLogger);
+ () -> mActivityLaunchAnimator);
mViewMediator.start();
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/log/LogBufferTest.kt b/packages/SystemUI/tests/src/com/android/systemui/log/LogBufferTest.kt
index 7b12eb7..56aff3c 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/log/LogBufferTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/log/LogBufferTest.kt
@@ -41,18 +41,6 @@
}
@Test
- fun log_shouldSaveLogToBufferWithException() {
- val exception = createTestException("Some exception test message", "SomeExceptionTestClass")
- buffer.log("Test", LogLevel.INFO, "Some test message", exception)
-
- val dumpedString = dumpBuffer()
-
- assertThat(dumpedString).contains("Some test message")
- assertThat(dumpedString).contains("Some exception test message")
- assertThat(dumpedString).contains("SomeExceptionTestClass")
- }
-
- @Test
fun log_shouldRotateIfLogBufferIsFull() {
buffer.log("Test", LogLevel.INFO, "This should be rotated")
buffer.log("Test", LogLevel.INFO, "New test message")