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

Commit f37b20e1 authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "Fix 'always' preferred app assignment" into lmp-mr1-dev

parents 597bb696 57792912

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

+1 −1
Original line number Diff line number Diff line
@@ -3281,7 +3281,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                            // If the result set is different from when this

                            // was created, we need to clear it and re-ask the

                            // user their preference, if we're looking for an "always" type entry.

                            if (always && !pa.mPref.sameSet(query, priority)) {

                            if (always && !pa.mPref.sameSet(query)) {

                                Slog.i(TAG, "Result set changed, dropping preferred activity for "

                                        + intent + " type " + resolvedType);

                                if (DEBUG_PREFERRED) {

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

+2 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ public class PreferredComponent { 
        }

    }



    public boolean sameSet(List<ResolveInfo> query, int priority) {

    public boolean sameSet(List<ResolveInfo> query) {

        if (mSetPackages == null) {

            return query == null;

        }
@@ -201,10 +201,10 @@ public class PreferredComponent { 
        }

        final int NQ = query.size();

        final int NS = mSetPackages.length;



        int numMatch = 0;

        for (int i=0; i<NQ; i++) {

            ResolveInfo ri = query.get(i);

            if (ri.priority != priority) continue;

            ActivityInfo ai = ri.activityInfo;

            boolean good = false;

            for (int j=0; j<NS; j++) {