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

Fix null pointer exception am: 14810c7

Browse Source 
am: 00217cd

* commit '00217cddcd1d3a0681214fe9d629f61dbfb5d9e6':
  Fix null pointer exception
This commit is contained in:
Jorim Jaggi
2016-03-28 21:17:11 +00:00
committed by android-build-merger
parent c0d4b37a16 00217cddcd
commit e6612ea48b
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -947,8 +947,6 @@ class ActivityStarter {
// We didn't do anything... but it was needed (a.k.a., client don't use that
// intent!) And for paranoia, make sure we have correctly resumed the top activity.
resumeTargetStackIfNeeded();
mSupervisor.showNonResizeableDockToastIfNeeded(mStartActivity.task,
preferredLaunchStackId, mTargetStack.mStackId);
return START_TASK_TO_FRONT;
}
}
@@ -989,7 +987,7 @@ class ActivityStarter {
top.deliverNewIntentLocked(
mCallingUid, mStartActivity.intent, mStartActivity.launchedFromPackage);
mSupervisor.showNonResizeableDockToastIfNeeded(mStartActivity.task,
preferredLaunchStackId, mTargetStack.mStackId);
preferredLaunchStackId, topStack.mStackId);
return START_DELIVERED_TO_TOP;
}