Rename mergedInto to mergeTarget for clarity
Transition might not actually be merged when this is set as the name might imply
Test: atest FlickerLibTest
Bug: 308420859
Change-Id: Ib5f1f3bdd54fac94018d09d0613d5f6338cf2562
diff --git a/libraries/flicker/utils/src/android/tools/common/traces/wm/ShellTransitionData.kt b/libraries/flicker/utils/src/android/tools/common/traces/wm/ShellTransitionData.kt
index 7f98d64..6fb650b 100644
--- a/libraries/flicker/utils/src/android/tools/common/traces/wm/ShellTransitionData.kt
+++ b/libraries/flicker/utils/src/android/tools/common/traces/wm/ShellTransitionData.kt
@@ -26,7 +26,7 @@
val mergeTime: Timestamp? = null,
val abortTime: Timestamp? = null,
val handler: String? = null,
- val mergedInto: Int? = null,
+ val mergeTarget: Int? = null,
) {
init {
// We should never have empty timestamps, those should be passed as null
@@ -43,6 +43,6 @@
shellData.mergeTime ?: mergeTime,
shellData.abortTime ?: abortTime,
shellData.handler ?: handler,
- shellData.mergedInto ?: mergedInto,
+ shellData.mergeTarget ?: mergeTarget,
)
}
diff --git a/libraries/flicker/utils/src/android/tools/common/traces/wm/Transition.kt b/libraries/flicker/utils/src/android/tools/common/traces/wm/Transition.kt
index 0cbfa05..fca86cf 100644
--- a/libraries/flicker/utils/src/android/tools/common/traces/wm/Transition.kt
+++ b/libraries/flicker/utils/src/android/tools/common/traces/wm/Transition.kt
@@ -83,7 +83,7 @@
@JsName("changes") val changes: Array<TransitionChange> = wmData.changes ?: emptyArray()
- @JsName("mergedInto") val mergedInto = shellData.mergedInto
+ @JsName("mergeTarget") val mergedInto = shellData.mergeTarget
@JsName("handler") val handler = shellData.handler
diff --git a/libraries/flicker/utils/src/android/tools/device/traces/parsers/wm/ShellTransitionTraceParser.kt b/libraries/flicker/utils/src/android/tools/device/traces/parsers/wm/ShellTransitionTraceParser.kt
index 0b267e5..87863aa 100644
--- a/libraries/flicker/utils/src/android/tools/device/traces/parsers/wm/ShellTransitionTraceParser.kt
+++ b/libraries/flicker/utils/src/android/tools/device/traces/parsers/wm/ShellTransitionTraceParser.kt
@@ -120,7 +120,7 @@
Timestamps.from(elapsedNanos = entry.abortTimeNs)
},
handler = handlerMapping[entry.handler],
- mergedInto = if (entry.mergedInto == 0) null else entry.mergedInto
+ mergeTarget = if (entry.mergeTarget == 0) null else entry.mergeTarget
)
)
}
diff --git a/libraries/flicker/utils/test/src/android/tools/common/traces/wm/TransitionTest.kt b/libraries/flicker/utils/test/src/android/tools/common/traces/wm/TransitionTest.kt
index e4ca552..cac368b 100644
--- a/libraries/flicker/utils/test/src/android/tools/common/traces/wm/TransitionTest.kt
+++ b/libraries/flicker/utils/test/src/android/tools/common/traces/wm/TransitionTest.kt
@@ -94,7 +94,7 @@
mergeTime = Timestamps.from(23),
abortTime = Timestamps.from(24),
handler = "Handler1",
- mergedInto = 1,
+ mergeTarget = 1,
)
)
@@ -119,7 +119,7 @@
mergeTime = Timestamps.from(230),
abortTime = Timestamps.from(240),
handler = "Handler2",
- mergedInto = 10,
+ mergeTarget = 10,
)
)
