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

Commit f56e6212 authored by Song Chun Fan's avatar Song Chun Fan
Browse files

[ADI][32/N] renaming an action constant 

Renaming it to be consistent with existing user_action_required intents,
such as CONFIRM_INSTALL and CONFIRM_PRE_APPROVAL.

FLAG: android.content.pm.verification_service

BUG: 360129657
Test: manual with an installer app and make sure the dialogs are
prompted.
Test: CtsRootDeveloperVerificationPrivInstallerTarget36TestCases CtsRootDeveloperVerificationInstallerTarget36TestCases CtsRootDeveloperVerificationPrivInstallerTarget35TestCases CtsRootDeveloperVerificationInstallerTarget35TestCases CtsRootDeveloperVerificationVerifierTestCases

API-Coverage-Bug: 420966373

Change-Id: I258d74d05d6cbbb097fc8cd20ec24eb332df153a
parent edad08de

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4313,10 +4313,10 @@ package android.content.pm { 
    method @FlaggedApi("android.content.pm.verification_service") @RequiresPermission(android.Manifest.permission.DEVELOPER_VERIFICATION_AGENT) public final boolean setDeveloperVerificationPolicy(int);

    method @FlaggedApi("android.content.pm.verification_service") @RequiresPermission(android.Manifest.permission.SET_DEVELOPER_VERIFICATION_USER_RESPONSE) public void setDeveloperVerificationUserResponse(int, int);

    method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void setPermissionsResult(int, boolean);

    field @FlaggedApi("android.content.pm.verification_service") public static final String ACTION_CONFIRM_DEVELOPER_VERIFICATION = "android.content.pm.action.CONFIRM_DEVELOPER_VERIFICATION";

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

    field public static final String ACTION_CONFIRM_PRE_APPROVAL = "android.content.pm.action.CONFIRM_PRE_APPROVAL";

    field @FlaggedApi("android.content.pm.sdk_dependency_installer") public static final String ACTION_INSTALL_DEPENDENCY = "android.content.pm.action.INSTALL_DEPENDENCY";

    field @FlaggedApi("android.content.pm.verification_service") public static final String ACTION_NOTIFY_DEVELOPER_VERIFICATION_INCOMPLETE = "android.content.pm.action.NOTIFY_DEVELOPER_VERIFICATION_INCOMPLETE";

    field public static final int DATA_LOADER_TYPE_INCREMENTAL = 2; // 0x2

    field public static final int DATA_LOADER_TYPE_NONE = 0; // 0x0

    field public static final int DATA_LOADER_TYPE_STREAMING = 1; // 0x1

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

+2 −2
Original line number Diff line number Diff line
@@ -240,8 +240,8 @@ public class PackageInstaller { 
     */

    @SystemApi

    @FlaggedApi(Flags.FLAG_VERIFICATION_SERVICE)

    public static final String ACTION_NOTIFY_DEVELOPER_VERIFICATION_INCOMPLETE =

            "android.content.pm.action.NOTIFY_DEVELOPER_VERIFICATION_INCOMPLETE";

    public static final String ACTION_CONFIRM_DEVELOPER_VERIFICATION =

            "android.content.pm.action.CONFIRM_DEVELOPER_VERIFICATION";



    /**

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

packages/PackageInstaller/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter android:priority="1">

                <action android:name="android.content.pm.action.NOTIFY_DEVELOPER_VERIFICATION_INCOMPLETE" />

                <action android:name="android.content.pm.action.CONFIRM_DEVELOPER_VERIFICATION" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>

packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public class InstallStart extends Activity { 
                PackageInstaller.ACTION_CONFIRM_PRE_APPROVAL.equals(intentAction)

                || PackageInstaller.ACTION_CONFIRM_INSTALL.equals(intentAction)

                || (Flags.verificationService()

                && PackageInstaller.ACTION_NOTIFY_DEVELOPER_VERIFICATION_INCOMPLETE.equals(

                && PackageInstaller.ACTION_CONFIRM_DEVELOPER_VERIFICATION.equals(

                        intentAction));



        // If the activity was started via a PackageInstaller session, we retrieve the originating
@@ -217,7 +217,7 @@ public class InstallStart extends Activity { 
        nextActivity.putExtra(PackageInstallerActivity.EXTRA_IS_TRUSTED_SOURCE, isTrustedSource);



        if (Flags.verificationService()

                && PackageInstaller.ACTION_NOTIFY_DEVELOPER_VERIFICATION_INCOMPLETE.equals(

                && PackageInstaller.ACTION_CONFIRM_DEVELOPER_VERIFICATION.equals(

                        intentAction)) {

            nextActivity.setClass(this, ConfirmDeveloperVerification.class);

            nextActivity.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);

packages/PackageInstaller/src/com/android/packageinstaller/v2/model/InstallRepository.kt

+4 −4
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ class InstallRepository(private val context: Context) { 
            PackageInstaller.ACTION_CONFIRM_PRE_APPROVAL == intent.action

                || PackageInstaller.ACTION_CONFIRM_INSTALL == intent.action

                || (Flags.verificationService()

                && PackageInstaller.ACTION_NOTIFY_DEVELOPER_VERIFICATION_INCOMPLETE == intent.action)

                && PackageInstaller.ACTION_CONFIRM_DEVELOPER_VERIFICATION == intent.action)



        sessionId = if (isSessionInstall)

            intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID, SessionInfo.INVALID_ID)
@@ -328,7 +328,7 @@ class InstallRepository(private val context: Context) { 
        val uri = intent.data

        val action = intent.action



        if (PackageInstaller.ACTION_NOTIFY_DEVELOPER_VERIFICATION_INCOMPLETE == action) {

        if (PackageInstaller.ACTION_CONFIRM_DEVELOPER_VERIFICATION == action) {

            _stagingResult.value = InstallVerificationConfirmationRequired()

            return

        }
@@ -562,7 +562,7 @@ class InstallRepository(private val context: Context) { 
            // mOriginatingURI = null;

            // mReferrerURI = null;

            pendingUserActionReason = info.getPendingUserActionReason()

        } else if (PackageInstaller.ACTION_NOTIFY_DEVELOPER_VERIFICATION_INCOMPLETE == intent.action) {

        } else if (PackageInstaller.ACTION_CONFIRM_DEVELOPER_VERIFICATION == intent.action) {

            val info = packageInstaller.getSessionInfo(sessionId)

            val resolvedPath = info?.resolvedBaseApkPath

            if (info == null || !info.isSealed || resolvedPath == null) {
@@ -1099,7 +1099,7 @@ class InstallRepository(private val context: Context) { 
    }



    fun setUserVerificationResponse(responseCode: Int) {

        if (PackageInstaller.ACTION_NOTIFY_DEVELOPER_VERIFICATION_INCOMPLETE != intent.action) {

        if (PackageInstaller.ACTION_CONFIRM_DEVELOPER_VERIFICATION != intent.action) {

            Log.e(LOG_TAG, "Cannot set verification response for this request: $intent")

            _installResult.value = InstallAborted(ABORT_REASON_INTERNAL_ERROR)

            return