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

Commit 77b09382 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "[ActivityManager] Fix index OOB when updating visible." into mnc-dev

parents 8c6750ff 36ee73d1

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

+6 −1
Original line number Diff line number Diff line
@@ -1326,8 +1326,13 @@ final class ActivityStack { 
                        if (r != starting) {

                            mStackSupervisor.startSpecificActivityLocked(

                                    r, noStackActivityResumed, false);

                            if (activityNdx >= activities.size()) {

                                // Record may be removed if its process needs to restart.

                                activityNdx = activities.size() - 1;

                            } else {

                                noStackActivityResumed = false;

                            }

                        }



                    } else if (r.visible) {

                        // If this activity is already visible, then there is nothing