Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '46f618a7d9dde8e668666e0c582d88ddfea759d9':
  Keydispatching timeout while finish Activity
This commit is contained in:
Craig Mautner
2013-12-19 18:00:40 +00:00
committed by Android Git Automerger
parent ad1ff47213 46f618a7d9
commit b905a37c7a
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/java/com/android/server/am/ActivityStack.java
View File

@@ -2513,6 +2513,7 @@ final class ActivityStack {
// activity into the stopped state and then finish it. // activity into the stopped state and then finish it.
if (localLOGV) Slog.v(TAG, "Enqueueing pending finish: " + r); if (localLOGV) Slog.v(TAG, "Enqueueing pending finish: " + r);
mStackSupervisor.mFinishingActivities.add(r); mStackSupervisor.mFinishingActivities.add(r);
r.resumeKeyDispatchingLocked();
mStackSupervisor.getFocusedStack().resumeTopActivityLocked(null); mStackSupervisor.getFocusedStack().resumeTopActivityLocked(null);
return r; return r;
} }