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

Commit 4cabbef8 authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "Make sure to stop noHistory="true" activities properly" into jb-dev

parents 36eeb6a5 5007ddde

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

+3 −1
Original line number Diff line number Diff line
@@ -3282,7 +3282,9 @@ final class ActivityStack { 
                requestFinishActivityLocked(r.appToken, Activity.RESULT_CANCELED, null,

                        "no-history");

            }

        } else if (r.app != null && r.app.thread != null) {

        }



        if (r.app != null && r.app.thread != null) {

            if (mMainStack) {

                if (mService.mFocusedActivity == r) {

                    mService.setFocusedActivityLocked(topRunningActivityLocked(null));