OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
18116c0
)
Specify the time units for waitForActivityWithTimeout
author
Ben Gruver
<bgruv@google.com>
Fri, 22 Jan 2016 21:11:11 +0000
(13:11 -0800)
committer
Ben Gruver
<bgruv@google.com>
Fri, 22 Jan 2016 21:11:11 +0000
(13:11 -0800)
Change-Id: I21bf943e03d1f85094af5e7579fefb27f302f16c
core/java/android/app/Instrumentation.java
patch
|
blob
|
history
diff --git
a/core/java/android/app/Instrumentation.java
b/core/java/android/app/Instrumentation.java
index
7184337
..
24a3470
100644
(file)
--- a/
core/java/android/app/Instrumentation.java
+++ b/
core/java/android/app/Instrumentation.java
@@
-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
*/