Merge "Fix static wallpaper component" into udc-dev

2023-03-28 14:01:34 +00:00
parent 0b42fdfc7d f8fe56ec94
commit fc3d80354d
1 changed files with 5 additions and 1 deletions
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/TaskTransitionTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/TaskTransitionTest.kt
@@ -219,9 +219,13 @@ class TaskTransitionTest(flicker: FlickerTest) : BaseTest(flicker) {
            val resourceId =
                Resources.getSystem()
                    .getIdentifier("image_wallpaper_component", "string", "android")
-            return ComponentNameMatcher.unflattenFromString(
+            // frameworks/base/core/res/res/values/config.xml returns package plus class name,
+            // but wallpaper layer has only class name
+            val rawComponentMatcher = ComponentNameMatcher.unflattenFromString(
                instrumentation.targetContext.resources.getString(resourceId)
            )
+
+            return ComponentNameMatcher(rawComponentMatcher.className)
        }

        @Parameterized.Parameters(name = "{0}")