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

* commit '4dcf1af3ed8dfa546e6cbf5ecfa66914a3fda883': Keydispatching timeout while finish Activity
2013-12-19 09:55:33 -08:00
parent 91f6aaaf2c 4dcf1af3ed
commit a8dfd5d896
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;
    }