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

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

am 1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev 

* commit '1289a3b2':
  [ActivityManager] Fix NPE when start activity
parents 753f4fc9 1289a3b2

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

+2 −1
Original line number Diff line number Diff line
@@ -1314,7 +1314,6 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                }

            }

        }

        ActivityStack resultStack = resultRecord == null ? null : resultRecord.task.stack;



        final int launchFlags = intent.getFlags();
@@ -1391,6 +1390,8 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            }

        }



        final ActivityStack resultStack = resultRecord == null ? null : resultRecord.task.stack;



        if (err != ActivityManager.START_SUCCESS) {

            if (resultRecord != null) {

                resultStack.sendActivityResultLocked(-1,