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

Merge "Require INSTALL_PACKAGES if FRP is enabled"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-26 20:31:11 +00:00
committed by Android (Google) Code Review
parent e3c711603c 7e2b8e66cf
commit c3c4e7f0fe
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/PackageInstallerSession.java
View File

@@ -959,9 +959,13 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
assertPreparedAndNotDestroyedLocked("commit");
assertNoWriteFileTransfersOpenLocked();
if (forTransfer) {
final boolean enforceInstallPackages = forTransfer
|| (android.provider.Settings.Secure.getInt(mContext.getContentResolver(),
android.provider.Settings.Secure.SECURE_FRP_MODE, 0) == 1);
if (enforceInstallPackages) {
mContext.enforceCallingOrSelfPermission(Manifest.permission.INSTALL_PACKAGES, null);
}
if (forTransfer) {
if (mInstallerUid == mOriginalInstallerUid) {
throw new IllegalArgumentException("Session has not been transferred");
}