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

Commit 0e954dcc authored by Olawale Ogunwale's avatar Olawale Ogunwale Committed by Android Git Automerger
Browse files

am bfb30244: Merge "[ActivityManager] Fix NPE when start activity" 

* commit 'bfb30244':
  [ActivityManager] Fix NPE when start activity
parents b0dd6d3a bfb30244

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

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

            }

        }

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



        final int launchFlags = intent.getFlags();
@@ -1392,6 +1391,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,