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

Commit 78cea814 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Update flags before querying activities when parsing default apps."

parents 25fb0a9b 5fd83dcd

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

+1 −1
Original line number Diff line number Diff line
@@ -3258,7 +3258,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
    /**

     * Update given flags when being used to request {@link ResolveInfo}.

     */

    private int updateFlagsForResolve(int flags, int userId, Object cookie) {

    int updateFlagsForResolve(int flags, int userId, Object cookie) {

        return updateFlagsForComponent(flags, userId, cookie);

    }

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -3045,6 +3045,7 @@ final class Settings {













    private void applyDefaultPreferredActivityLPw(PackageManagerService service,















            Intent intent, int flags, ComponentName cn, String scheme, PatternMatcher ssp,















            IntentFilter.AuthorityEntry auth, PatternMatcher path, int userId) {













        flags = service.updateFlagsForResolve(flags, userId, intent);















        List<ResolveInfo> ri = service.mActivities.queryIntent(intent,















                intent.getType(), flags, 0);















        if (PackageManagerService.DEBUG_PREFERRED) Log.d(TAG, "Queried " + intent