Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: c9039e0

* commit 'c9039e05eab7ce3a2fcc0a05c88d4da492129579':
  Fix for activity manager crash due to null task

Change-Id: If3c133994598ac64a1cd806fa1c97c7524de42d1
This commit is contained in:
Chong Zhang
2016-04-09 03:24:47 +00:00
committed by android-build-merger
parent b33175f836 c9039e05ea
commit 68476eb9da
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -986,8 +986,12 @@ class ActivityStarter {
} }
top.deliverNewIntentLocked( top.deliverNewIntentLocked(
mCallingUid, mStartActivity.intent, mStartActivity.launchedFromPackage); 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; return START_DELIVERED_TO_TOP;
} }