diff options
| author | Craig Mautner <cmautner@google.com> | 2013-12-19 18:03:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-19 18:03:58 +0000 |
| commit | 8a4c62e3fa89dba0d7681fffed6b2e40b7d539e2 (patch) | |
| tree | f2af4b285180c48c99ba45657f39cbf7138afa11 /services/java/com/android | |
| parent | 8907644bb6afbbabd31ac37f908ddcaa1a2a7e93 (diff) | |
| parent | b905a37c7a18e8ad98497dea5ab7bd016e3c995d (diff) | |
| download | frameworks_base-8a4c62e3fa89dba0d7681fffed6b2e40b7d539e2.zip frameworks_base-8a4c62e3fa89dba0d7681fffed6b2e40b7d539e2.tar.gz frameworks_base-8a4c62e3fa89dba0d7681fffed6b2e40b7d539e2.tar.bz2 | |
am b905a37c: am 46f618a7: am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity"
* commit 'b905a37c7a18e8ad98497dea5ab7bd016e3c995d':
Keydispatching timeout while finish Activity
Diffstat (limited to 'services/java/com/android')
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index 39a93a7..a26313d 100644 --- 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; } |