Merge pull request #2249 from android:forceenable

PiperOrigin-RevId: 647039328
android · Jun 26, 2024 · 136bf7f · 136bf7f
2 parents 7cf2440 + 3e1d6df
commit 136bf7f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/runner/monitor/CHANGELOG.md b/runner/monitor/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 **Bug Fixes**
 
+* Catch and log NoSuchMethodError on forceEnableAppTracing calls
+
 **New Features**
 
 **Breaking Changes**

diff --git a/runner/monitor/java/androidx/test/platform/tracing/AndroidXTracer.java b/runner/monitor/java/androidx/test/platform/tracing/AndroidXTracer.java
@@ -59,6 +59,15 @@ public AndroidXTracer enableTracing() {
       // The AndroidX call can fail if reflection is not allowed.
       // We want to log the error yet we should not break any test in this case.
       Log.e(TAG, "enableTracing failed", e);
+    } catch (NoSuchMethodError e) {
+      // This can occur if an androidx.tracing < 1.1.0 is put on classpath instead.
+      // See http://issuetracker.google.com/349628366).
+      // We want to log the error yet we should not break any test in this case.
+      Log.e(
+          TAG,
+          "enableTracing failed. "
+              + "You may need to upgrade your androidx.tracing:tracing version",
+          e);
     }
     return this;
   }