commit 1aaeed98be1e6c5128fd05eb4d0e429870dd5c90
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jun 04 04:07:44 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 04 04:07:44 2021 +0000
tree 39023e9cfd73f613e1c75395b266f48d955ad440
parent 36be45403d0b584c15c7d8a894cf7be18f8e5c67
parent 4508f0321683d6ba31d1d8d78449335a926c3bed

Merge "Snap for 7424499 from edee420c90d296996aa1f1fd2063fd1091297823 to android11-tests-release" into android11-tests-release

src/com/android/tradefed/log/BaseStreamLogger.java

diff --git a/src/com/android/tradefed/log/BaseStreamLogger.java b/src/com/android/tradefed/log/BaseStreamLogger.java
index ec5adb6..3703132 100644
--- a/src/com/android/tradefed/log/BaseStreamLogger.java
+++ b/src/com/android/tradefed/log/BaseStreamLogger.java
@@ -56,7 +56,7 @@
     }
 
     /** @return current minimum {@link LogLevel} to display on stdout. */
-    LogLevel getLogLevelDisplay() {
+    public LogLevel getLogLevelDisplay() {
         return mLogLevelDisplay;
     }
 

src/com/android/tradefed/testtype/suite/retry/RetryRescheduler.java

diff --git a/src/com/android/tradefed/testtype/suite/retry/RetryRescheduler.java b/src/com/android/tradefed/testtype/suite/retry/RetryRescheduler.java
index bec86e0..17bb807 100644
--- a/src/com/android/tradefed/testtype/suite/retry/RetryRescheduler.java
+++ b/src/com/android/tradefed/testtype/suite/retry/RetryRescheduler.java
@@ -158,10 +158,11 @@
 
             // Transfer log level from retry to subconfig
             ILeveledLogOutput originalLogger = originalConfig.getLogOutput();
-            originalLogger.setLogLevel(mConfiguration.getLogOutput().getLogLevel());
-            if (originalLogger instanceof FileLogger) {
+            ILeveledLogOutput retryLogger = mConfiguration.getLogOutput();
+            originalLogger.setLogLevel(retryLogger.getLogLevel());
+            if (originalLogger instanceof FileLogger && retryLogger instanceof FileLogger) {
                 ((FileLogger) originalLogger)
-                        .setLogLevelDisplay(mConfiguration.getLogOutput().getLogLevel());
+                        .setLogLevelDisplay(((FileLogger) retryLogger).getLogLevelDisplay());
             }
 
             handleExtraResultReporter(originalConfig, mConfiguration);