Merge "Require INSTALL_PACKAGES permission"

This commit is contained in:
TreeHugger Robot
2016-11-30 00:14:31 +00:00
committed by Android (Google) Code Review

View File

@@ -2957,6 +2957,18 @@ public class PackageManagerService extends IPackageManager.Stub {
| (!Build.IS_DEBUGGABLE ? MATCH_SYSTEM_ONLY : 0);
final List<ResolveInfo> matches = queryIntentActivitiesInternal(intent, PACKAGE_MIME_TYPE,
resolveFlags, UserHandle.USER_SYSTEM);
Iterator<ResolveInfo> iter = matches.iterator();
while (iter.hasNext()) {
final ResolveInfo rInfo = iter.next();
final PackageSetting ps = mSettings.mPackages.get(rInfo.activityInfo.packageName);
if (ps != null) {
final PermissionsState permissionsState = ps.getPermissionsState();
if (permissionsState.hasPermission(Manifest.permission.INSTALL_PACKAGES, 0)) {
continue;
}
}
iter.remove();
}
if (matches.size() == 0) {
return null;
} else if (matches.size() == 1) {