commit cccf2a333793badbcea9b04fe3f29447496a56d9
author Craig Mautner <cmautner@google.com> Thu Dec 19 17:48:58 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 19 17:48:58 2013 +0000
tree 9a5e672e324ee52a72457eae1c5fcb572568196e
parent f3172c623e4bb77a047262c6e7eedc4a2c2ea95a
parent c8733b818d9e7eef0d986128f16d12145486b69f

Merge "Keydispatching timeout while finish Activity"

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

diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 47593f2..37f4cd7 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -2526,6 +2526,7 @@
         // 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;
     }