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

Commit d642f479 authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add the null ptr check that's not merged in master"

parents 72b817d1 b0a87431

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

+1 −1
Original line number Diff line number Diff line
@@ -2561,7 +2561,7 @@ final class ActivityStack { 
                    // what's left last time.

                    for (int i = next.newIntents.size() - 1; i >= 0; i--) {

                        final Intent intent = next.newIntents.get(i);

                        if (!ActivityRecord.isMainIntent(intent)) {

                        if (intent != null && !ActivityRecord.isMainIntent(intent)) {

                            allowSavedSurface = false;

                            break;

                        }