Internal change

PiperOrigin-RevId: 714981574
google · Jan 14, 2025 · d456d23 · d456d23
1 parent decc659
commit d456d23
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 39 deletions.
diff --git a/...ava/com/google/wireless/qa/mobileharness/shared/api/decorator/AndroidLogCatDecorator.java b/...ava/com/google/wireless/qa/mobileharness/shared/api/decorator/AndroidLogCatDecorator.java
@@ -190,52 +190,57 @@ public void run(final TestInfo testInfo) throws MobileHarnessException, Interrup
     if (jobInfo.params().isTrue(AndroidLogCatSpec.PARAM_LOG_TO_FILE)) {
       logFilePath = PathUtil.join(testInfo.getGenFileDir(), LOG_CAT_FILE_NAME);
     }
-    int bufferSize = AndroidLogCatSpec.LOG_BUFFER_SIZE_MAX_KB;
-    boolean isLogBufferSizeSpecified =
-        jobInfo.params().has(AndroidLogCatSpec.PARAM_LOG_BUFFER_SIZE_KB);
-    if (isLogBufferSizeSpecified) {
-      bufferSize = jobInfo.params().getInt(AndroidLogCatSpec.PARAM_LOG_BUFFER_SIZE_KB, 0);
-    }
     int sdkVersion = getDeviceSdkVersion(deviceId);
-    try {
-      testInfo
-          .log()
-          .atInfo()
-          .alsoTo(logger)
-          .log(
-              "Output setting log buffer size = %d KB: %s",
-              bufferSize, adbUtil.setLogCatBufferSize(deviceId, sdkVersion, bufferSize));
-    } catch (MobileHarnessException e) {
-      if (isLogBufferSizeSpecified
-          && !jobInfo
-              .params()
-              .getBool(
-                  AndroidLogCatSpec.PARAM_IGNORE_LOG_BUFFER_SIZE_SET_FAILURE,
-                  DEFAULT_IGNORE_LOG_BUFFER_SIZE_SET_FAILURE)) {
-        if (DeviceUtil.inSharedLab()) {
-          throw new MobileHarnessException(
-              AndroidErrorId.ANDROID_LOGCAT_DECORATOR_SET_LOGCAT_BUFFER_SIZE_ERROR_IN_SHARED_LAB,
-              String.format("Failed to set logcat buffer size on device %s", deviceId),
-              e);
-        } else {
-          throw new MobileHarnessException(
-              AndroidErrorId.ANDROID_LOGCAT_DECORATOR_SET_LOGCAT_BUFFER_SIZE_ERROR_IN_SATELLITE_LAB,
-              String.format(
-                  "Failed to set logcat buffer size on device %s. Please consider 1. not setting"
-                      + " log_buffer_size_kb, and we'll use a default size; or 2. set"
-                      + " ignore_log_buffer_size_set_failure true, the default size will also be"
-                      + " used",
-                  deviceId),
-              e);
-        }
-      } else {
+
+    if (jobInfo.params().getBool(AndroidLogCatSpec.PARAM_SET_LOG_BUFFER_SIZE, true)) {
+      int bufferSize = AndroidLogCatSpec.LOG_BUFFER_SIZE_MAX_KB;
+      boolean isLogBufferSizeSpecified =
+          jobInfo.params().has(AndroidLogCatSpec.PARAM_LOG_BUFFER_SIZE_KB);
+      if (isLogBufferSizeSpecified) {
+        bufferSize = jobInfo.params().getInt(AndroidLogCatSpec.PARAM_LOG_BUFFER_SIZE_KB, 0);
+      }
+      try {
         testInfo
             .log()
             .atInfo()
             .alsoTo(logger)
-            .log("Failed to set logcat buffer size on device %s. Ignoring.", deviceId);
+            .log(
+                "Output setting log buffer size = %d KB: %s",
+                bufferSize, adbUtil.setLogCatBufferSize(deviceId, sdkVersion, bufferSize));
+      } catch (MobileHarnessException e) {
+        if (isLogBufferSizeSpecified
+            && !jobInfo
+                .params()
+                .getBool(
+                    AndroidLogCatSpec.PARAM_IGNORE_LOG_BUFFER_SIZE_SET_FAILURE,
+                    DEFAULT_IGNORE_LOG_BUFFER_SIZE_SET_FAILURE)) {
+          if (DeviceUtil.inSharedLab()) {
+            throw new MobileHarnessException(
+                AndroidErrorId.ANDROID_LOGCAT_DECORATOR_SET_LOGCAT_BUFFER_SIZE_ERROR_IN_SHARED_LAB,
+                String.format("Failed to set logcat buffer size on device %s", deviceId),
+                e);
+          } else {
+            throw new MobileHarnessException(
+                AndroidErrorId
+                    .ANDROID_LOGCAT_DECORATOR_SET_LOGCAT_BUFFER_SIZE_ERROR_IN_SATELLITE_LAB,
+                String.format(
+                    "Failed to set logcat buffer size on device %s. Please consider 1. not setting"
+                        + " log_buffer_size_kb, and we'll use a default size; or 2. set"
+                        + " ignore_log_buffer_size_set_failure true, the default size will also be"
+                        + " used",
+                    deviceId),
+                e);
+          }
+        } else {
+          testInfo
+              .log()
+              .atInfo()
+              .alsoTo(logger)
+              .log("Failed to set logcat buffer size on device %s. Ignoring.", deviceId);
+        }
       }
     }
+
     if (jobInfo.params().isTrue(AndroidLogCatSpec.PARAM_ASYNC_LOG)) {
       asyncRun(testInfo, sdkVersion, filterSpecs, options, logFilePath);
     } else {

diff --git a/src/java/com/google/wireless/qa/mobileharness/shared/api/spec/AndroidLogCatSpec.java b/src/java/com/google/wireless/qa/mobileharness/shared/api/spec/AndroidLogCatSpec.java
@@ -69,6 +69,11 @@ public interface AndroidLogCatSpec {
       help = "Whether clear the log before running the test. By default it is True.")
   String PARAM_CLEAR_LOG = "clear_log";
 
+  @ParamAnnotation(
+      required = false,
+      help = "Whether to set the size of the log buffer. By default it is True.")
+  String PARAM_SET_LOG_BUFFER_SIZE = "set_log_buffer_size";
+
   @ParamAnnotation(
       required = false,
       help = "The size of the log buffer. If not specified, use default.")