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

Commit 99b514ac authored by Jeongeun Song's avatar Jeongeun Song Committed by Louis Chang
Browse files

Resolve the home intent with MATCH_DEFAULT_ONLY 

When a 3rd party home app which doesn't have CATEGORY_DEFAULT and a
user clicks the home button, the ResolverActivity always comes out even
though the user clicked always on the ResolverActivity. This change
adds MATCH_DEFAULT_ONLY while resolving the home intent by consolidating
the intent resolving through ActivityTaskSupervisor#resolveIntent.

Bug: 245383780
Test: Install a 3rd party home app without CATEGORY_DEFAULT and click
the home button

Change-Id: If24f8531aeb91f38e247ed396677f76c4a62c719
parent 9b3af05b

services/core/java/com/android/server/wm/RootWindowContainer.java

+2 −2
Original line number Diff line number Diff line
@@ -1487,8 +1487,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            } else {

                final String resolvedType =

                        homeIntent.resolveTypeIfNeeded(mService.mContext.getContentResolver());

                final ResolveInfo info = AppGlobals.getPackageManager()

                        .resolveIntent(homeIntent, resolvedType, flags, userId);

                final ResolveInfo info = mTaskSupervisor.resolveIntent(homeIntent, resolvedType,

                        userId, flags, Binder.getCallingUid());

                if (info != null) {

                    aInfo = info.activityInfo;

                }