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

Merge "Fix NPE when checking if recents should be launched in docked mode."

Browse Source
This commit is contained in:
Filip Gruszczynski
2016-01-19 02:29:17 +00:00
committed by Android (Google) Code Review
parent 90131a9189 ddb96df921
commit 6cf93664f6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1034,7 +1034,8 @@ class ActivityStarter {
}
private void launchRecentsAppIfNeeded(ActivityStack topStack) {
if (topStack.mStackId == HOME_STACK_ID && mTargetStack.mStackId == DOCKED_STACK_ID) {
if (topStack.mStackId == HOME_STACK_ID && mTargetStack != null
&& mTargetStack.mStackId == DOCKED_STACK_ID) {
// We launch an activity while being in home stack, which means either launcher or
// recents into docked stack. We don't want the launched activity to be alone in a
// docked stack, so we want to immediately launch recents too.