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

Commit 25fa934a authored by Hai Zhang's avatar Hai Zhang Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Return the preferred home activity first to honor persistent... 

DO NOT MERGE Return the preferred home activity first to honor persistent preferred activity. am: bb478f97

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19997597



Change-Id: Ie47733f11a98f3c2ca04d2b321c01644fbadbafb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1e73e84f bb478f97

services/core/java/com/android/server/pm/ComputerEngine.java

+20 −17
Original line number Diff line number Diff line
@@ -1192,8 +1192,9 @@ public class ComputerEngine implements Computer { 
        }

        allHomeCandidates.addAll(resolveInfos);



        String packageName = mDefaultAppProvider.getDefaultHome(userId);

        if (packageName == null) {

        String packageName = null;

        // Workaround for b/237330774 in T: return the preferred activity first to honor

        // persistent preferred activity.

        // Role changes are not and cannot be atomic because its implementation lives inside

        // a system app, so when the home role changes, there is a window when the previous

        // role holder is removed and the new role holder is granted the preferred activity,
@@ -1210,6 +1211,8 @@ public class ComputerEngine implements Computer { 
        if (preferredResolveInfo != null && preferredResolveInfo.activityInfo != null) {

            packageName = preferredResolveInfo.activityInfo.packageName;

        }

        if (packageName == null) {

            packageName = mDefaultAppProvider.getDefaultHome(userId);

        }

        if (packageName == null) {

            return null;