diff options
| -rw-r--r-- | core/java/android/app/Instrumentation.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index 2952e6bd5856..f99b42074018 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -536,9 +536,11 @@ public class Instrumentation { */ public final Activity waitForActivityWithTimeout(long timeOut) { synchronized (this) { - try { - wait(timeOut); - } catch (InterruptedException e) { + if (mLastActivity == null) { + try { + wait(timeOut); + } catch (InterruptedException e) { + } } if (mLastActivity == null) { return null; |