commit ba0492d5edd3e6e24d948c531b74ffb5fc9b922e
author Dianne Hackborn <hackbod@google.com> Tue Oct 12 19:01:46 2010 -0700
committer Dianne Hackborn <hackbod@google.com> Tue Oct 12 19:01:46 2010 -0700
tree 8452016fd3a0e7806647ce06cf288be94ebe31ee
parent 45738f6700cff689eacda7c8192b76939ba20591

Fix issue #3089800: adb shell am -W causes ActivityManager crash

Change-Id: I5508afeb523d84e552117f94c8b70e2bae2c33fa

services/java/com/android/server/am/ActivityStack.java

diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 016ddcd..86c7bdf 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -2535,7 +2535,7 @@
                     mWaitingActivityLaunched.add(outResult);
                     do {
                         try {
-                            wait();
+                            mService.wait();
                         } catch (InterruptedException e) {
                         }
                     } while (!outResult.timeout && outResult.who == null);
@@ -2551,7 +2551,7 @@
                         mWaitingActivityVisible.add(outResult);
                         do {
                             try {
-                                wait();
+                                mService.wait();
                             } catch (InterruptedException e) {
                             }
                         } while (!outResult.timeout && outResult.who == null);