Merge "Fix static wallpaper component" into udc-dev

1 files changed, 5 insertions, 1 deletions

diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/TaskTransitionTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/TaskTransitionTest.kt
index dd9e4cffcd30..3fccd12af1c4 100644
--- 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}")