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

DO NOT MERGE Removed unused priority argument am: 7113328b53

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15704694

Change-Id: I594a21d3c50c90016d65874aa054c4c46b324c10
This commit is contained in:
Lee Shombert
2021-08-31 21:52:13 +00:00
committed by Automerger Merge Worker
parent dd217a6a5a 7113328b53
commit 04f4c46b81
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10242,7 +10242,7 @@ public class PackageManagerService extends IPackageManager.Stub
userId); userId);
// Find any earlier preferred or last chosen entries and nuke them // Find any earlier preferred or last chosen entries and nuke them
findPreferredActivityNotLocked( findPreferredActivityNotLocked(
intent, resolvedType, flags, query, 0, false, true, false, userId); intent, resolvedType, flags, query, false, true, false, userId);
// Add the new activity as the last chosen for this filter // Add the new activity as the last chosen for this filter
addPreferredActivity(filter, match, null, activity, false, userId, addPreferredActivity(filter, match, null, activity, false, userId,
"Setting last chosen", false); "Setting last chosen", false);
@@ -10258,7 +10258,7 @@ public class PackageManagerService extends IPackageManager.Stub
final List<ResolveInfo> query = queryIntentActivitiesInternal(intent, resolvedType, flags, final List<ResolveInfo> query = queryIntentActivitiesInternal(intent, resolvedType, flags,
userId); userId);
return findPreferredActivityNotLocked( return findPreferredActivityNotLocked(
intent, resolvedType, flags, query, 0, false, false, false, userId); intent, resolvedType, flags, query, false, false, false, userId);
} }
private void requestInstantAppResolutionPhaseTwo(AuxiliaryResolveInfo responseObj, private void requestInstantAppResolutionPhaseTwo(AuxiliaryResolveInfo responseObj,
@@ -10300,7 +10300,7 @@ public class PackageManagerService extends IPackageManager.Stub
// If we have saved a preference for a preferred activity for // If we have saved a preference for a preferred activity for
// this Intent, use that. // this Intent, use that.
ResolveInfo ri = findPreferredActivityNotLocked(intent, resolvedType, ResolveInfo ri = findPreferredActivityNotLocked(intent, resolvedType,
flags, query, r0.priority, true, false, debug, userId, queryMayBeFiltered); flags, query, true, false, debug, userId, queryMayBeFiltered);
if (ri != null) { if (ri != null) {
return ri; return ri;
} }
@@ -10477,17 +10477,17 @@ public class PackageManagerService extends IPackageManager.Stub
} }
ResolveInfo findPreferredActivityNotLocked(Intent intent, String resolvedType, int flags, ResolveInfo findPreferredActivityNotLocked(Intent intent, String resolvedType, int flags,
List<ResolveInfo> query, int priority, boolean always, List<ResolveInfo> query, boolean always,
boolean removeMatches, boolean debug, int userId) { boolean removeMatches, boolean debug, int userId) {
return findPreferredActivityNotLocked( return findPreferredActivityNotLocked(
intent, resolvedType, flags, query, priority, always, removeMatches, debug, userId, intent, resolvedType, flags, query, always, removeMatches, debug, userId,
UserHandle.getAppId(Binder.getCallingUid()) >= Process.FIRST_APPLICATION_UID); UserHandle.getAppId(Binder.getCallingUid()) >= Process.FIRST_APPLICATION_UID);
} }
// TODO: handle preferred activities missing while user has amnesia // TODO: handle preferred activities missing while user has amnesia
/** <b>must not hold {@link #mLock}</b> */ /** <b>must not hold {@link #mLock}</b> */
ResolveInfo findPreferredActivityNotLocked(Intent intent, String resolvedType, int flags, ResolveInfo findPreferredActivityNotLocked(Intent intent, String resolvedType, int flags,
List<ResolveInfo> query, int priority, boolean always, List<ResolveInfo> query, boolean always,
boolean removeMatches, boolean debug, int userId, boolean queryMayBeFiltered) { boolean removeMatches, boolean debug, int userId, boolean queryMayBeFiltered) {
if (Thread.holdsLock(mLock)) { if (Thread.holdsLock(mLock)) {
Slog.wtf(TAG, "Calling thread " + Thread.currentThread().getName() Slog.wtf(TAG, "Calling thread " + Thread.currentThread().getName()
@@ -23470,7 +23470,7 @@ public class PackageManagerService extends IPackageManager.Stub
final List<ResolveInfo> resolveInfos = queryIntentActivitiesInternal(intent, null, final List<ResolveInfo> resolveInfos = queryIntentActivitiesInternal(intent, null,
MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE, userId); MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE, userId);
final ResolveInfo preferredResolveInfo = findPreferredActivityNotLocked( final ResolveInfo preferredResolveInfo = findPreferredActivityNotLocked(
intent, null, 0, resolveInfos, 0, true, false, false, userId); intent, null, 0, resolveInfos, true, false, false, userId);
final String packageName = preferredResolveInfo != null final String packageName = preferredResolveInfo != null
&& preferredResolveInfo.activityInfo != null && preferredResolveInfo.activityInfo != null
? preferredResolveInfo.activityInfo.packageName : null; ? preferredResolveInfo.activityInfo.packageName : null;