Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '259c849989ccd30b0bb4569d11f125ed2c0c1911' into gingerbread-plus-aosp

* commit '259c849989ccd30b0bb4569d11f125ed2c0c1911':
  Fix issue #3089800: adb shell am -W causes ActivityManager crash
This commit is contained in:
Dianne Hackborn
2010-10-12 19:08:49 -07:00
committed by Android Git Automerger
parent 373a69614e 259c849989
commit 4ce930da99
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/am/ActivityStack.java
View File

@@ -2535,7 +2535,7 @@ public class ActivityStack {
mWaitingActivityLaunched.add(outResult); mWaitingActivityLaunched.add(outResult);
do { do {
try { try {
wait(); mService.wait();
} catch (InterruptedException e) { } catch (InterruptedException e) {
} }
} while (!outResult.timeout && outResult.who == null); } while (!outResult.timeout && outResult.who == null);
@@ -2551,7 +2551,7 @@ public class ActivityStack {
mWaitingActivityVisible.add(outResult); mWaitingActivityVisible.add(outResult);
do { do {
try { try {
wait(); mService.wait();
} catch (InterruptedException e) { } catch (InterruptedException e) {
} }
} while (!outResult.timeout && outResult.who == null); } while (!outResult.timeout && outResult.who == null);