Merge "[flexiglass] Fixes logging for falsing" into main (39b795df) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/scene/shared/logger/SceneLogger.kt

+10 −5

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ class SceneLogger @Inject constructor(@SceneFrameworkLog private val logBuffer:
		fun logSceneChangeRejection(
		from: ContentKey?,
		to: ContentKey?,
		originalChangeReason: String,
		originalChangeReason: String?,
		rejectionReason: String,
		) {
		logBuffer.log(
		@@ -113,8 +113,10 @@ class SceneLogger @Inject constructor(@SceneFrameworkLog private val logBuffer:
		}
		)
		append("change $str1 because \"$str2\"")
		if (str3 != null) {
		append(" (original change reason: \"$str3\")")
		}
		}
		},
		)
		}
		@@ -136,8 +138,11 @@ class SceneLogger @Inject constructor(@SceneFrameworkLog private val logBuffer:
		logBuffer.log(
		tag = TAG,
		level = LogLevel.INFO,
		messageInitializer = { str1 = transitionState.currentScene.toString() },
		messagePrinter = { "Scene transition idle on: $str1" },
		messageInitializer = {
		str1 = transitionState.currentScene.toString()
		str2 = transitionState.currentOverlays.joinToString()
		},
		messagePrinter = { "Scene transition idle on: $str1, overlays: $str2" },
		)
		}
		}

+18 −9

Original line number	Diff line number	Diff line
		@@ -219,7 +219,8 @@ constructor(
		* it being a false touch.
		*/
		fun canChangeScene(toScene: SceneKey): Boolean {
		return isInteractionAllowedByFalsing(toScene).also {
		return isInteractionAllowedByFalsing(toScene).also { sceneChangeAllowed ->
		if (sceneChangeAllowed) {
		// A scene change is guaranteed; log it.
		logger.logSceneChanged(
		from = currentScene.value,
		@@ -228,6 +229,14 @@ constructor(
		reason = "user interaction",
		isInstant = false,
		)
		} else {
		logger.logSceneChangeRejection(
		from = currentScene.value,
		to = toScene,
		originalChangeReason = null,
		rejectionReason = "Falsing: false touch detected",
		)
		}
		}
		}