Cherry-pick changes to select module accurately

Change-Id: Iccda7a0ab817b4f496f3e22131ecfaf5e5c21f0f
Test: presubmit
Bug: 234305694
Merged-In: Ic807f5c9a0cd01ebae2b610a84bfa34d0833c167

1 files changed, 5 insertions, 1 deletions

diff --git a/tools/cts-media-preparer-app/src/android/mediastress/cts/preconditions/app/MediaPreparerAppTest.java b/tools/cts-media-preparer-app/src/android/mediastress/cts/preconditions/app/MediaPreparerAppTest.java
index 0f4fd691170..7f80e5601e8 100644
--- a/tools/cts-media-preparer-app/src/android/mediastress/cts/preconditions/app/MediaPreparerAppTest.java
+++ b/tools/cts-media-preparer-app/src/android/mediastress/cts/preconditions/app/MediaPreparerAppTest.java
@@ -82,8 +82,12 @@ public class MediaPreparerAppTest {
 
     @Test
     public void testGetResolutions() throws Exception {
+        String moduleName = InstrumentationRegistry.getArguments().getString("module-name");
+        if (moduleName == null) {
+            moduleName = MODULE_NAME;
+        }
         Resolution maxRes = new Resolution(DEFAULT_MAX_WIDTH, DEFAULT_MAX_HEIGHT);
-        DynamicConfigDeviceSide config = new DynamicConfigDeviceSide(MODULE_NAME);
+        DynamicConfigDeviceSide config = new DynamicConfigDeviceSide(moduleName);
         for (String key : config.keySet()) {
             int width = 0;
             int height = 0;