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

Commit 3fa88533 authored by Patrick Baumann's avatar Patrick Baumann
Browse files

DO NOT MERGE Avoids deadlock when applying preferred activities 

Prior to this change, we were resolving the mime type of a given intent
while holding the package lock. With this change, we instead rely on the
preferred-activity declaration to define the mime type if it's
important, removing need for an activity manager service call and the
potential for deadlock.

Fixes: 143105100
Test: Manual; sideload to /system/etc/preferred-apps/ and reset app preferences
Change-Id: Ia87b7ecbd7987ef654fb0fc2bda942cd6a9c00a7
parent 1d7a53da

core/java/android/content/pm/PackageManagerInternal.java

+11 −0
Original line number Diff line number Diff line
@@ -414,6 +414,17 @@ public abstract class PackageManagerInternal { 
    public abstract List<ResolveInfo> queryIntentActivities(Intent intent,

            @ResolveInfoFlags int flags, int filterCallingUid, int userId);



    /**

     * Retrieve all activities that can be performed for the given intent.

     * @param filterCallingUid The results will be filtered in the context of this UID instead

     * of the calling UID.

     * @see PackageManager#queryIntentActivities(Intent, int)

     */

    public abstract List<ResolveInfo> queryIntentActivities(

            Intent intent, @Nullable String resolvedType, @ResolveInfoFlags int flags,

            int filterCallingUid, int userId);





    /**

     * Retrieve all services that can be performed for the given intent.

     * @see PackageManager#queryIntentServices(Intent, int)

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

+6 −0
Original line number Diff line number Diff line
@@ -24520,6 +24520,12 @@ public class PackageManagerService extends IPackageManager.Stub 
        public List<ResolveInfo> queryIntentActivities(

                Intent intent, int flags, int filterCallingUid, int userId) {

            final String resolvedType = intent.resolveTypeIfNeeded(mContext.getContentResolver());

            return queryIntentActivities(intent, resolvedType, flags, filterCallingUid, userId);

        }













        @Override













        public List<ResolveInfo> queryIntentActivities(













                Intent intent, String resolvedType, int flags, int filterCallingUid, int userId) {















            return PackageManagerService.this















                    .queryIntentActivitiesInternal(intent, resolvedType, flags, filterCallingUid,















                            userId, false /*resolveForStart*/, true /*allowDynamicSplits*/);

























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



+2
−1




























Original line number
Diff line number
Diff line








@@ -3337,7 +3337,8 @@ public final class Settings {













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















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















        final List<ResolveInfo> ri =













                pmInternal.queryIntentActivities(intent, flags, Binder.getCallingUid(), 0);













                pmInternal.queryIntentActivities(













                        intent, intent.getType(), flags, Binder.getCallingUid(), 0);















        if (PackageManagerService.DEBUG_PREFERRED) {















            Log.d(TAG, "Queried " + intent + " results: " + ri);















        }