commit 51fbcf4ef683f8e003922c5a9e3ea9195bce44f0
author Daniel Peykov <peykov@google.com> Mon Jun 01 19:35:40 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 01 19:35:40 2020 +0000
tree 0a1ea3a5296d9ae02551d8a4ceb367cca3e6a08c
parent 09b766b9eb6dec9ce1dcdbb0f246e4b205cdb523
parent 8e8b3df3db2f23f53b486693c70712d4ac90f2fe

Merge "Simplify AOA key actions"

tests/perf/PerfTransitionTest/src/com/android/apptransition/tests/AppTransitionTests.java

diff --git a/tests/perf/PerfTransitionTest/src/com/android/apptransition/tests/AppTransitionTests.java b/tests/perf/PerfTransitionTest/src/com/android/apptransition/tests/AppTransitionTests.java
index 6d5136f..1df767c 100644
--- a/tests/perf/PerfTransitionTest/src/com/android/apptransition/tests/AppTransitionTests.java
+++ b/tests/perf/PerfTransitionTest/src/com/android/apptransition/tests/AppTransitionTests.java
@@ -121,18 +121,18 @@
         }
 
         createLaunchIntentMappings();
-        String mAppsList = mArgs.getString(LAUNCH_APPS);
-        mPreAppsList = mArgs.getString(PRE_LAUNCH_APPS);
+
+        String appsList = mArgs.getString(LAUNCH_APPS, "");
+        mPreAppsList = mArgs.getString(PRE_LAUNCH_APPS, "");
         mLaunchIterations = Integer.parseInt(mArgs.getString(KEY_LAUNCH_ITERATIONS,
                 DEFAULT_LAUNCH_COUNT));
         mPostLaunchTimeout = Integer.parseInt(mArgs.getString(KEY_POST_LAUNCH_TIMEOUT,
                 DEFAULT_POST_LAUNCH_TIMEOUT));
-        if (null == mAppsList && mAppsList.isEmpty()) {
+        if (null == appsList || appsList.isEmpty()) {
             throw new IllegalArgumentException("Need atleast one app to do the"
                     + " app transition from launcher");
         }
-        mAppsList = mAppsList.replaceAll("%"," ");
-        mAppListArray = mAppsList.split(DELIMITER);
+        mAppListArray = appsList.split(DELIMITER);
 
         // Parse the trace parameters
         mTraceDirectoryStr = mArgs.getString(KEY_TRACE_DIRECTORY);
@@ -266,11 +266,10 @@
         if (isTracesEnabled()) {
             createTraceDirectory("testAppToRecents");
         }
-        if (null == mPreAppsList && mPreAppsList.isEmpty()) {
+        if (null == mPreAppsList || mPreAppsList.isEmpty()) {
             throw new IllegalArgumentException("Need atleast few apps in the "
                     + "recents before starting the test");
         }
-        mPreAppsList = mPreAppsList.replaceAll("%"," ");
         mPreAppsListArray = mPreAppsList.split(DELIMITER);
         mPreAppsComponentName.clear();
         populateRecentsList();
@@ -311,11 +310,10 @@
         if (isTracesEnabled()) {
             createTraceDirectory("testHotLaunchFromRecents");
         }
-        if (null == mPreAppsList && mPreAppsList.isEmpty()) {
+        if (null == mPreAppsList || mPreAppsList.isEmpty()) {
             throw new IllegalArgumentException("Need atleast few apps in the"
                     + " recents before starting the test");
         }
-        mPreAppsList = mPreAppsList.replaceAll("%", " ");
         mPreAppsListArray = mPreAppsList.split(DELIMITER);
         mPreAppsComponentName.clear();
         populateRecentsList();
@@ -567,7 +565,8 @@
      * @param appNames
      */
     private void closeApps(String[] appNames) {
-        for (int i = 0; i < appNames.length; i++) {
+        int length = appNames == null ? 0 : appNames.length;
+        for (int i = 0; i < length; i++) {
             Intent startIntent = mAppLaunchIntentsMapping.get(appNames[i]);
             if (startIntent != null) {
                 String packageName = startIntent.getComponent().getPackageName();