Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0c607b97: am f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-dev

Browse Source 
* commit '0c607b97f068ca486036a501052572e9207c0926':
  Fix 'always' preferred app assignment
This commit is contained in:
Christopher Tate
2015-01-28 01:35:58 +00:00
committed by Android Git Automerger
parent 00483559b3 0c607b97f0
commit ff1876d1fb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -3281,7 +3281,7 @@ public class PackageManagerService extends IPackageManager.Stub {
// If the result set is different from when this // If the result set is different from when this
// was created, we need to clear it and re-ask the // was created, we need to clear it and re-ask the
// user their preference, if we're looking for an "always" type entry. // 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 " Slog.i(TAG, "Result set changed, dropping preferred activity for "
+ intent + " type " + resolvedType); + intent + " type " + resolvedType);
if (DEBUG_PREFERRED) { if (DEBUG_PREFERRED) {

4
services/core/java/com/android/server/pm/PreferredComponent.java
View File

@@ -192,7 +192,7 @@ public class PreferredComponent {
} }
} }
public boolean sameSet(List<ResolveInfo> query, int priority) { public boolean sameSet(List<ResolveInfo> query) {
if (mSetPackages == null) { if (mSetPackages == null) {
return query == null; return query == null;
} }
@@ -201,10 +201,10 @@ public class PreferredComponent {
} }
final int NQ = query.size(); final int NQ = query.size();
final int NS = mSetPackages.length; final int NS = mSetPackages.length;
int numMatch = 0; int numMatch = 0;
for (int i=0; i<NQ; i++) { for (int i=0; i<NQ; i++) {
ResolveInfo ri = query.get(i); ResolveInfo ri = query.get(i);
if (ri.priority != priority) continue;
ActivityInfo ai = ri.activityInfo; ActivityInfo ai = ri.activityInfo;
boolean good = false; boolean good = false;
for (int j=0; j<NS; j++) { for (int j=0; j<NS; j++) {