Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ed90466 authored by Ben Gruver's avatar Ben Gruver Committed by Android (Google) Code Review
Browse files

Merge "Specify the time units for waitForActivityWithTimeout"

parents cda00b15 87904e83

core/java/android/app/Instrumentation.java

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ public class Instrumentation { 
         * returning the resulting activity or till the timeOut period expires.

         * If the timeOut expires before the activity is started, return null. 

         * 

         * @param timeOut Time to wait before the activity is created.

         * @param timeOut Time to wait in milliseconds before the activity is created.

         * 

         * @return Activity

         */