diff options
-rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 2 | ||||
-rw-r--r-- | services/core/java/com/android/server/pm/PreferredComponent.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 28ac601..d3fede7 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -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) { diff --git a/services/core/java/com/android/server/pm/PreferredComponent.java b/services/core/java/com/android/server/pm/PreferredComponent.java index 69c1909..8e2e0cd 100644 --- a/services/core/java/com/android/server/pm/PreferredComponent.java +++ b/services/core/java/com/android/server/pm/PreferredComponent.java @@ -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++) { |