Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" into gingerbread

2010-10-12 19:06:37 -07:00
parent 64f4280313 ba0492d5ed
commit 259c849989
1 changed files with 2 additions and 2 deletions
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -2535,7 +2535,7 @@ public class ActivityStack {
                    mWaitingActivityLaunched.add(outResult);
                    do {
                        try {
-                            wait();
+                            mService.wait();
                        } catch (InterruptedException e) {
                        }
                    } while (!outResult.timeout && outResult.who == null);
@@ -2551,7 +2551,7 @@ public class ActivityStack {
                        mWaitingActivityVisible.add(outResult);
                        do {
                            try {
-                                wait();
+                                mService.wait();
                            } catch (InterruptedException e) {
                            }
                        } while (!outResult.timeout && outResult.who == null);