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

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

Merge "Rename ACTION_CONFIRM_PERMISSIONS -> ACTION_CONFIRM_INSTALL"

parents ddc0f7ee e8fe3cb1

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

+1 −2
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ public class PackageInstaller { 
            "android.content.pm.action.SESSION_COMMITTED";



    /** {@hide} */

    public static final String

            ACTION_CONFIRM_PERMISSIONS = "android.content.pm.action.CONFIRM_PERMISSIONS";

    public static final String ACTION_CONFIRM_INSTALL = "android.content.pm.action.CONFIRM_INSTALL";



    /**

     * An integer session ID that an operation is working with.

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

+3 −3
Original line number Diff line number Diff line
@@ -947,9 +947,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        Preconditions.checkNotNull(mResolvedBaseFile);



        if (needToAskForPermissionsLocked()) {

            // User needs to accept permissions; give installer an intent they

            // can use to involve user.

            final Intent intent = new Intent(PackageInstaller.ACTION_CONFIRM_PERMISSIONS);

            // User needs to confirm installation; give installer an intent they can use to involve

            // user.

            final Intent intent = new Intent(PackageInstaller.ACTION_CONFIRM_INSTALL);

            intent.setPackage(mContext.getPackageManager().getPermissionControllerPackageName());

            intent.putExtra(PackageInstaller.EXTRA_SESSION_ID, sessionId);

            try {