am b905a37c: am 46f618a7: am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity"

* commit 'b905a37c7a18e8ad98497dea5ab7bd016e3c995d': Keydispatching timeout while finish Activity
2013-12-19 18:03:58 +00:00
parent 8907644bb6 b905a37c7a
commit 8a4c62e3fa
1 changed files with 1 additions and 0 deletions
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -2531,6 +2531,7 @@ final class ActivityStack {
        // activity into the stopped state and then finish it.
        if (localLOGV) Slog.v(TAG, "Enqueueing pending finish: " + r);
        mStackSupervisor.mFinishingActivities.add(r);
+        r.resumeKeyDispatchingLocked();
        mStackSupervisor.getFocusedStack().resumeTopActivityLocked(null);
        return r;
    }