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

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

am 00454026: am 1d8b27bc: am 1289a3b2: Merge "[ActivityManager] Fix NPE when... 

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

* commit '00454026':
  [ActivityManager] Fix NPE when start activity
parents 1d0ff728 00454026

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,