From ba0492d5edd3e6e24d948c531b74ffb5fc9b922e Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Tue, 12 Oct 2010 19:01:46 -0700
Subject: [PATCH] Fix issue #3089800: adb shell am -W causes ActivityManager
 crash

Change-Id: I5508afeb523d84e552117f94c8b70e2bae2c33fa
---
 services/java/com/android/server/am/ActivityStack.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 016ddcd72412e..86c7bdf9189c0 100644
--- 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);