Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 094b761c authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Fix issue with home activity started with standard activity type" into pi-dev am: 25a1d9d8 

am: e485fe13

Change-Id: Icf66b31509133ce4d26f91751082c872bab4ec41
parents 56b20ec6 e485fe13

services/core/java/com/android/server/am/ActivityRecord.java

+5 −0
Original line number Diff line number Diff line
@@ -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();

    }