Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 912932c2 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 4ce930da: am 259c8499: Merge "Fix issue #3089800: adb shell am -W causes... 

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

Merge commit '4ce930da'

* commit '4ce930da':
  Fix issue #3089800: adb shell am -W causes ActivityManager crash
parents c8e87e3c 4ce930da

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

+2 −2
Original line number Diff line number Diff line
@@ -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);