Apply other flags even if one flag throw exception

Bug: 332524762
Test: presubmit
Change-Id: I138c5d0429f2fccc40d47a8e02b6e5a8d163b066

1 files changed, 6 insertions, 6 deletions

diff --git a/src/com/android/tradefed/command/CommandScheduler.java b/src/com/android/tradefed/command/CommandScheduler.java
index 3f4b8e0ad..988d1a726 100644
--- a/src/com/android/tradefed/command/CommandScheduler.java
+++ b/src/com/android/tradefed/command/CommandScheduler.java
@@ -635,9 +635,9 @@ public class CommandScheduler extends Thread implements ICommandScheduler, IComm
             }
             // Set experimental flags
             if (config.getCommandOptions().isExperimentEnabled()) {
-                try {
-                    for (Map.Entry<String, String> entry :
-                            config.getCommandOptions().getExperimentalFlags().entrySet()) {
+                for (Map.Entry<String, String> entry :
+                        config.getCommandOptions().getExperimentalFlags().entrySet()) {
+                    try {
                         String optionName = entry.getKey();
                         String optionValue = entry.getValue();
                         // Support map experiments, where optionValue is a key=value pair
@@ -651,10 +651,10 @@ public class CommandScheduler extends Thread implements ICommandScheduler, IComm
                         }
                         mInvocationContext.addInvocationAttribute(
                                 "experiment:" + optionName, optionValue);
+                    } catch (ConfigurationException e) {
+                        CLog.e("Configuration Exception caught while setting experimental flags.");
+                        CLog.e(e);
                     }
-                } catch (ConfigurationException e) {
-                    CLog.e("Configuration Exception caught while setting experimental flags.");
-                    CLog.e(e);
                 }
             }
             mStartTime = System.currentTimeMillis();