Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3c4e7f0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Require INSTALL_PACKAGES if FRP is enabled"

parents e3c71160 7e2b8e66

services/core/java/com/android/server/pm/PackageInstallerSession.java

+6 −2
Original line number Diff line number Diff line
@@ -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");

                }