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

Merge "Enforce package visibility filter on the PreferredActivities" into sc-dev

Browse Source
This commit is contained in:
Rhed Jao
2021-06-02 07:30:34 +00:00
committed by Android (Google) Code Review
parent 82166510eb 10f0195f46
commit e892a527a4
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22726,7 +22726,8 @@ public class PackageManagerService extends IPackageManager.Stub
*/ */
public int getPreferredActivitiesInternal(List<WatchedIntentFilter> outFilters, public int getPreferredActivitiesInternal(List<WatchedIntentFilter> outFilters,
List<ComponentName> outActivities, String packageName) { List<ComponentName> outActivities, String packageName) {
if (getInstantAppPackageName(Binder.getCallingUid()) != null) { final int callingUid = Binder.getCallingUid();
if (getInstantAppPackageName(callingUid) != null) {
return 0; return 0;
} }
int num = 0; int num = 0;
@@ -22738,9 +22739,13 @@ public class PackageManagerService extends IPackageManager.Stub
final Iterator<PreferredActivity> it = pir.filterIterator(); final Iterator<PreferredActivity> it = pir.filterIterator();
while (it.hasNext()) { while (it.hasNext()) {
final PreferredActivity pa = it.next(); final PreferredActivity pa = it.next();
final String prefPackageName = pa.mPref.mComponent.getPackageName();
if (packageName == null if (packageName == null
|| (pa.mPref.mComponent.getPackageName().equals(packageName) || (prefPackageName.equals(packageName) && pa.mPref.mAlways)) {
&& pa.mPref.mAlways)) { if (shouldFilterApplicationLocked(
mSettings.getPackageLPr(prefPackageName), callingUid, userId)) {
continue;
}
if (outFilters != null) { if (outFilters != null) {
outFilters.add(new WatchedIntentFilter(pa.getIntentFilter())); outFilters.add(new WatchedIntentFilter(pa.getIntentFilter()));
} }