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

Commit 5f9811fa authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Whitelist all perms on installExistingPackage"

parents 739a1832 bfcffa08

apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java

+3 −2
Original line number Diff line number Diff line
@@ -485,8 +485,9 @@ public class UserLifecycleTests { 
        });



        final IPackageInstaller installer = AppGlobals.getPackageManager().getPackageInstaller();

        installer.installExistingPackage(packageName, 0, PackageManager.INSTALL_REASON_UNKNOWN,

                sender, userId);

        installer.installExistingPackage(packageName,

                PackageManager.INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS,

                PackageManager.INSTALL_REASON_UNKNOWN, sender, userId, null);



        try {

            latch.await(TIMEOUT_IN_SECOND, TimeUnit.SECONDS);

core/java/android/app/ApplicationPackageManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1953,8 +1953,8 @@ public class ApplicationPackageManager extends PackageManager { 
    private int installExistingPackageAsUser(String packageName, int installReason, int userId)

            throws NameNotFoundException {

        try {

            int res = mPM.installExistingPackageAsUser(packageName, userId, 0 /*installFlags*/,

                    installReason);

            int res = mPM.installExistingPackageAsUser(packageName, userId,

                    INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS, installReason, null);

            if (res == INSTALL_FAILED_INVALID_URI) {

                throw new NameNotFoundException("Package " + packageName + " doesn't exist");

            }

core/java/android/content/pm/IPackageInstaller.aidl

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ interface IPackageInstaller { 
            in IntentSender statusReceiver, int userId);



    void installExistingPackage(String packageName, int installFlags, int installReason,

            in IntentSender statusReceiver, int userId);

            in IntentSender statusReceiver, int userId, in List<String> whiteListedPermissions);



    void setPermissionsResult(int sessionId, boolean accepted);

}

core/java/android/content/pm/IPackageManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ interface IPackageManager { 
    int getInstallLocation();



    int installExistingPackageAsUser(String packageName, int userId, int installFlags,

            int installReason);

            int installReason, in List<String> whiteListedPermissions);



    void verifyPendingInstall(int id, int verificationCode);

    void extendVerificationTimeout(int id, int verificationCodeAtTimeout, long millisecondsToDelay);

core/java/android/content/pm/PackageInstaller.java

+7 −2
Original line number Diff line number Diff line
@@ -627,6 +627,10 @@ public class PackageInstaller { 
     * Install the given package, which already exists on the device, for the user for which this

     * installer was created.

     *

     * <p>This will

     * {@link PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set) whitelist

     * all restricted permissions}.

     *

     * @param packageName The package to install.

     * @param installReason Reason for install.

     * @param statusReceiver Where to deliver the result.
@@ -639,8 +643,9 @@ public class PackageInstaller { 
            @Nullable IntentSender statusReceiver) {

        Preconditions.checkNotNull(packageName, "packageName cannot be null");

        try {

            mInstaller.installExistingPackage(packageName, 0, installReason, statusReceiver,

                    mUserId);

            mInstaller.installExistingPackage(packageName,

                    PackageManager.INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS, installReason,

                    statusReceiver, mUserId, null);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }