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

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

Merge "Fix for activity manager crash due to null task" into nyc-dev

parents 1f07649e d44063cb

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

+6 −2
Original line number Diff line number Diff line
@@ -986,8 +986,12 @@ class ActivityStarter { 
            }

            top.deliverNewIntentLocked(

                    mCallingUid, mStartActivity.intent, mStartActivity.launchedFromPackage);

            mSupervisor.handleNonResizableTaskIfNeeded(mStartActivity.task,

                    preferredLaunchStackId, topStack.mStackId);



            // Don't use mStartActivity.task to show the toast. We're not starting a new activity

            // but reusing 'top'. Fields in mStartActivity may not be fully initialized.

            mSupervisor.handleNonResizableTaskIfNeeded(

                    top.task, preferredLaunchStackId, topStack.mStackId);



            return START_DELIVERED_TO_TOP;

        }