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

Merge "Fix issue with home activity started with standard activity type" into pi-dev

Browse Source 
am: 25a1d9d898

Change-Id: If0ebf8ac3100dbef8b97c4c8eba50857f483d74e
This commit is contained in:
Winson Chung
2018-05-22 10:07:47 -07:00
committed by android-build-merger
parent b37470ff6d 25a1d9d898
commit e485fe13be
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActivityRecord.java
View File

@@ -1077,6 +1077,11 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
// System process can launch home activity. // System process can launch home activity.
return true; return true;
} }
// Allow the recents component to launch the home activity.
final RecentTasks recentTasks = mStackSupervisor.mService.getRecentTasks();
if (recentTasks != null && recentTasks.isCallerRecents(uid)) {
return true;
}
// Resolver activity can launch home activity. // Resolver activity can launch home activity.
return sourceRecord != null && sourceRecord.isResolverActivity(); return sourceRecord != null && sourceRecord.isResolverActivity();
} }