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

Merge "Do not set outActivity if value is null." into oc-dev

Browse Source
This commit is contained in:
Wale Ogunwale
2017-04-10 20:04:06 +00:00
committed by Android (Google) Code Review
parent 73edcd7328 1d8b1afeaf
commit a09111e745
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1038,7 +1038,7 @@ class ActivityStarter {
sendPowerHintForLaunchStartIfNeeded(false /* forceSend */); sendPowerHintForLaunchStartIfNeeded(false /* forceSend */);
reusedActivity = setTargetStackAndMoveToFrontIfNeeded(reusedActivity); reusedActivity = setTargetStackAndMoveToFrontIfNeeded(reusedActivity);
if (outActivity.length > 0) { if (outActivity != null && outActivity.length > 0) {
outActivity[0] = reusedActivity; outActivity[0] = reusedActivity;
} }