Merge "Revert "Add LogBuffers to KeyguardViewMediator"" (9b34631e) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ class KeyguardUpdateMonitorLogger @Inject constructor(

		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)

deleted100644 → 0

+0 −690

File deleted.

Preview size limit exceeded, changes collapsed.

+168 −139

File changed.

Preview size limit exceeded, changes collapsed.

+2 −5

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import com.android.keyguard.dagger.KeyguardQsUserSwitchComponent;
		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 @@ public class KeyguardModule {
		InteractionJankMonitor interactionJankMonitor,
		DreamOverlayStateController dreamOverlayStateController,
		Lazy<NotificationShadeWindowController> notificationShadeWindowController,
		Lazy<ActivityLaunchAnimator> activityLaunchAnimator,
		KeyguardViewMediatorLogger logger) {
		Lazy<ActivityLaunchAnimator> activityLaunchAnimator) {
		return new KeyguardViewMediator(
		context,
		falsingCollector,
		@@ -134,8 +132,7 @@ public class KeyguardModule {
		interactionJankMonitor,
		dreamOverlayStateController,
		notificationShadeWindowController,
		activityLaunchAnimator,
		logger);
		activityLaunchAnimator);
		}

		/** */

+2 −7

Original line number	Diff line number	Diff line
		@@ -158,13 +158,8 @@ class LogBuffer @JvmOverloads constructor(
		* 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.