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

* commit 'a8dfd5d896b71faf87b03d27df6050284765fb21': Keydispatching timeout while finish Activity
2013-12-19 17:58:08 +00:00
parent 7bbc79fd68 a8dfd5d896
commit 46f618a7d9
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
@@ -2526,6 +2526,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;
    }