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

Commit 30f3ca20 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixes update ownership preapproval flow" into udc-dev am: af6fae7f am: ec703631 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24248274



Change-Id: Ic170d257dafb57f2cd20dabe9c44db24e19528ca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b7bfe91c ec703631

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

+32 −7
Original line number Original line Diff line number Diff line
@@ -67,6 +67,7 @@ import android.app.admin.DevicePolicyEventLogger; 
import android.app.admin.DevicePolicyManager;

import android.app.admin.DevicePolicyManager;

import android.app.admin.DevicePolicyManagerInternal;

import android.app.admin.DevicePolicyManagerInternal;

import android.compat.annotation.ChangeId;

import android.compat.annotation.ChangeId;

import android.compat.annotation.Disabled;

import android.compat.annotation.EnabledSince;

import android.compat.annotation.EnabledSince;

import android.content.ComponentName;

import android.content.ComponentName;

import android.content.Context;

import android.content.Context;
@@ -310,6 +311,19 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.S)

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.S)

    private static final long SILENT_INSTALL_ALLOWED = 265131695L;

    private static final long SILENT_INSTALL_ALLOWED = 265131695L;





    /**

     * The system supports pre-approval and update ownership features from

     * {@link Build.VERSION_CODES#UPSIDE_DOWN_CAKE API 34}. The change id is used to make sure

     * the system includes the fix of pre-approval with update ownership case. When checking the

     * change id, if it is disabled, it means the build includes the fix. The more detail is on

     * b/293644536.

     * See {@link PackageInstaller.SessionParams#setRequestUpdateOwnership(boolean)} and

     * {@link #requestUserPreapproval(PreapprovalDetails, IntentSender)} for more details.

     */

    @Disabled

    @ChangeId

    private static final long PRE_APPROVAL_WITH_UPDATE_OWNERSHIP_FIX = 293644536L;



    /**

    /**

     * The default value of {@link #mValidatedTargetSdk} is {@link Integer#MAX_VALUE}. If {@link

     * The default value of {@link #mValidatedTargetSdk} is {@link Integer#MAX_VALUE}. If {@link

     * #mValidatedTargetSdk} is compared with {@link Build.VERSION_CODES#S} before getting the

     * #mValidatedTargetSdk} is compared with {@link Build.VERSION_CODES#S} before getting the
@@ -893,16 +907,27 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            if (mPermissionsManuallyAccepted) {

            if (mPermissionsManuallyAccepted) {

                return USER_ACTION_NOT_NEEDED;

                return USER_ACTION_NOT_NEEDED;

            }

            }

            // For pre-pappvoal case, the mPackageName would be null.

            if (mPackageName != null) {

                packageName = mPackageName;

                packageName = mPackageName;

            } else if (mPreapprovalRequested.get() && mPreapprovalDetails != null) {

                packageName = mPreapprovalDetails.getPackageName();

            } else {

                packageName = null;

            }

            hasDeviceAdminReceiver = mHasDeviceAdminReceiver;

            hasDeviceAdminReceiver = mHasDeviceAdminReceiver;

        }

        }





        final boolean forcePermissionPrompt =

        // For the below cases, force user action prompt

        // 1. installFlags includes INSTALL_FORCE_PERMISSION_PROMPT

        // 2. params.requireUserAction is USER_ACTION_REQUIRED

        final boolean forceUserActionPrompt =

                (params.installFlags & PackageManager.INSTALL_FORCE_PERMISSION_PROMPT) != 0

                (params.installFlags & PackageManager.INSTALL_FORCE_PERMISSION_PROMPT) != 0

                        || params.requireUserAction == SessionParams.USER_ACTION_REQUIRED;

                        || params.requireUserAction == SessionParams.USER_ACTION_REQUIRED;

        if (forcePermissionPrompt) {

        final int userActionNotTypicallyNeededResponse = forceUserActionPrompt

            return USER_ACTION_REQUIRED;

                ? USER_ACTION_REQUIRED

        }

                : USER_ACTION_NOT_NEEDED;



        // It is safe to access mInstallerUid and mInstallSource without lock

        // It is safe to access mInstallerUid and mInstallSource without lock

        // because they are immutable after sealing.

        // because they are immutable after sealing.

        final Computer snapshot = mPm.snapshotComputer();

        final Computer snapshot = mPm.snapshotComputer();
@@ -956,7 +981,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                || isInstallerDeviceOwnerOrAffiliatedProfileOwner();

                || isInstallerDeviceOwnerOrAffiliatedProfileOwner();





        if (noUserActionNecessary) {

        if (noUserActionNecessary) {

            return USER_ACTION_NOT_NEEDED;

            return userActionNotTypicallyNeededResponse;

        }

        }





        if (isUpdateOwnershipEnforcementEnabled

        if (isUpdateOwnershipEnforcementEnabled
@@ -969,7 +994,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        }

        }





        if (isPermissionGranted) {

        if (isPermissionGranted) {

            return USER_ACTION_NOT_NEEDED;

            return userActionNotTypicallyNeededResponse;

        }

        }





        if (snapshot.isInstallDisabledForPackage(getInstallerPackageName(), mInstallerUid,

        if (snapshot.isInstallDisabledForPackage(getInstallerPackageName(), mInstallerUid,