Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8dfd5d8 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

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

* commit '4dcf1af3':
  Keydispatching timeout while finish Activity
parents 91f6aaaf 4dcf1af3

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

+1 −0
Original line number Diff line number Diff line
@@ -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;

    }