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

Merge "Allow update owner to access InstallConstraints APIs" into udc-dev

Browse Source
This commit is contained in:
Joanne Chung
2023-05-11 11:29:57 +00:00
committed by Android (Google) Code Review
parent c9e66e40ac 6c28c614ef
commit 08d9484b49
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,6 +104,7 @@ import com.android.server.SystemConfig;
import com.android.server.SystemService; import com.android.server.SystemService;
import com.android.server.SystemServiceManager; import com.android.server.SystemServiceManager;
import com.android.server.pm.parsing.PackageParser2; import com.android.server.pm.parsing.PackageParser2;
import com.android.server.pm.pkg.PackageStateInternal;
import com.android.server.pm.utils.RequestThrottle; import com.android.server.pm.utils.RequestThrottle;
import libcore.io.IoUtils; import libcore.io.IoUtils;
@@ -1308,6 +1309,13 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
} }
} }
private boolean isValidForInstallConstraints(PackageStateInternal ps,
String installerPackageName) {
return TextUtils.equals(ps.getInstallSource().mInstallerPackageName, installerPackageName)
|| TextUtils.equals(ps.getInstallSource().mUpdateOwnerPackageName,
installerPackageName);
}
private CompletableFuture<InstallConstraintsResult> checkInstallConstraintsInternal( private CompletableFuture<InstallConstraintsResult> checkInstallConstraintsInternal(
String installerPackageName, List<String> packageNames, String installerPackageName, List<String> packageNames,
InstallConstraints constraints, long timeoutMillis) { InstallConstraints constraints, long timeoutMillis) {
@@ -1324,8 +1332,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
if (!PackageManagerServiceUtils.isSystemOrRootOrShell(callingUid)) { if (!PackageManagerServiceUtils.isSystemOrRootOrShell(callingUid)) {
for (var packageName : packageNames) { for (var packageName : packageNames) {
var ps = snapshot.getPackageStateInternal(packageName); var ps = snapshot.getPackageStateInternal(packageName);
if (ps == null || !TextUtils.equals( if (ps == null || !isValidForInstallConstraints(ps, installerPackageName)) {
ps.getInstallSource().mInstallerPackageName, installerPackageName)) {
throw new SecurityException("Caller has no access to package " + packageName); throw new SecurityException("Caller has no access to package " + packageName);
} }
} }