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

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

am 40c5c0ef: am 74a66013: am f71f5e89: Merge "[ActivityManager] fix NPE in... 

am 40c5c0ef: am 74a66013: am f71f5e89: Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked."

* commit '40c5c0ef':
  [ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.
parents de472a53 40c5c0ef

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2274,7 +2274,7 @@ final class ActivityStack { 
                    // In this case, we want to finish this activity

                    // In this case, we want to finish this activity

                    // and everything above it, so be sneaky and pretend

                    // and everything above it, so be sneaky and pretend

                    // like these are all in the reply chain.

                    // like these are all in the reply chain.

                    end = numActivities - 1;

                    end = activities.size() - 1;

                } else if (replyChainEnd < 0) {

                } else if (replyChainEnd < 0) {

                    end = i;

                    end = i;

                } else {

                } else {