Merge pull request #2330 from omustardoG:patch-1

PiperOrigin-RevId: 712998506
android · Jan 7, 2025 · e9de26f · e9de26f
2 parents be462cd + e8cbbae
commit e9de26f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
@@ -7,7 +7,7 @@
 **Bug Fixes**
 * Fix `Rect` handling in `ViewCapture` for SDK >= 34 for non root views.
 * Fix bug reporting the status code when PixelCopy fails in ViewCapture.generateBitmapFromPixelCopy.
-
+* Improving wording of a failure message.
 
 **New Features**
 

diff --git a/core/java/androidx/test/core/app/InstrumentationActivityInvoker.java b/core/java/androidx/test/core/app/InstrumentationActivityInvoker.java
@@ -289,7 +289,7 @@ public ActivityResult getActivityResult() {
       }
       checkNotNull(
           activityResult,
-          "onActivityResult never be called after %d milliseconds",
+          "onActivityResult was not called within %d milliseconds",
           ActivityLifecycleTimeout.getMillis());
       return activityResult;
     }