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

2018-05-22 16:50:00 +00:00
parent 1a31586918 547afd2dba
commit 25a1d9d898
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityRecord.java
+++ b/services/core/java/com/android/server/am/ActivityRecord.java
@@ -1077,6 +1077,11 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
            // System process can launch home activity.
            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.
        return sourceRecord != null && sourceRecord.isResolverActivity();
    }