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

Commit 5dbf82ed authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Correct unit in waitForMonitorWithTimeout JavaDoc."

parents 0e5adc0d c895a4b8

core/java/android/app/Instrumentation.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -816,7 +816,7 @@ public class Instrumentation { 
     * returned.  If the timeout expires, a null object is returned. 

     * returned.  If the timeout expires, a null object is returned. 

     *

     *

     * @param monitor The ActivityMonitor to wait for.

     * @param monitor The ActivityMonitor to wait for.

     * @param timeOut The timeout value in secs.

     * @param timeOut The timeout value in milliseconds.

     *

     *

     * @return The Activity object that matched the monitor.

     * @return The Activity object that matched the monitor.

     */

     */