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

Commit 3c7113a4 authored by Winson's avatar Winson
Browse files

Remove legacy IntentFilterVerificationManager 

Completely deletes all the code for v1 of domain verification,
delegating everything to the new DomainVerificationService.

Exempt-From-Owner-Approval: Already approved by owners on main branch

Bug: 171251883

Test: none, removal of effectively dead code

Change-Id: Ib222ccd46019c1c28b402c0f68466077b62871c1
parent 47dbabfc

core/api/system-current.txt

+12 −12
Original line number Diff line number Diff line
@@ -2153,7 +2153,7 @@ package android.content { 
    field public static final String ACTION_INCIDENT_REPORT_READY = "android.intent.action.INCIDENT_REPORT_READY";

    field public static final String ACTION_INSTALL_INSTANT_APP_PACKAGE = "android.intent.action.INSTALL_INSTANT_APP_PACKAGE";

    field public static final String ACTION_INSTANT_APP_RESOLVER_SETTINGS = "android.intent.action.INSTANT_APP_RESOLVER_SETTINGS";

    field public static final String ACTION_INTENT_FILTER_NEEDS_VERIFICATION = "android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION";

    field @Deprecated public static final String ACTION_INTENT_FILTER_NEEDS_VERIFICATION = "android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION";

    field public static final String ACTION_LOAD_DATA = "android.intent.action.LOAD_DATA";

    field @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public static final String ACTION_MANAGE_APP_PERMISSION = "android.intent.action.MANAGE_APP_PERMISSION";

    field public static final String ACTION_MANAGE_APP_PERMISSIONS = "android.intent.action.MANAGE_APP_PERMISSIONS";
@@ -2486,8 +2486,8 @@ package android.content.pm { 
    method @Nullable public abstract android.content.ComponentName getInstantAppInstallerComponent();

    method @Nullable public abstract android.content.ComponentName getInstantAppResolverSettingsComponent();

    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_INSTANT_APPS) public abstract java.util.List<android.content.pm.InstantAppInfo> getInstantApps();

    method @NonNull public abstract java.util.List<android.content.pm.IntentFilterVerificationInfo> getIntentFilterVerifications(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract int getIntentVerificationStatusAsUser(@NonNull String, int);

    method @Deprecated @NonNull public abstract java.util.List<android.content.pm.IntentFilterVerificationInfo> getIntentFilterVerifications(@NonNull String);

    method @Deprecated @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract int getIntentVerificationStatusAsUser(@NonNull String, int);

    method @android.content.pm.PackageManager.PermissionFlags @RequiresPermission(anyOf={android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS, android.Manifest.permission.GET_RUNTIME_PERMISSIONS}) public abstract int getPermissionFlags(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);

    method @NonNull @RequiresPermission(android.Manifest.permission.SUSPEND_APPS) public String[] getUnsuspendablePackages(@NonNull String[]);

    method @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public abstract void grantRuntimePermission(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);
@@ -2511,9 +2511,9 @@ package android.content.pm { 
    method @RequiresPermission(value=android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE, conditional=true) public void setSyntheticAppDetailsActivityEnabled(@NonNull String, boolean);

    method public void setSystemAppState(@NonNull String, int);

    method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public abstract void setUpdateAvailable(@NonNull String, boolean);

    method @RequiresPermission(android.Manifest.permission.SET_PREFERRED_APPLICATIONS) public abstract boolean updateIntentVerificationStatusAsUser(@NonNull String, int, int);

    method @Deprecated @RequiresPermission(android.Manifest.permission.SET_PREFERRED_APPLICATIONS) public abstract boolean updateIntentVerificationStatusAsUser(@NonNull String, int, int);

    method @RequiresPermission(anyOf={android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS}) public abstract void updatePermissionFlags(@NonNull String, @NonNull String, @android.content.pm.PackageManager.PermissionFlags int, @android.content.pm.PackageManager.PermissionFlags int, @NonNull android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.INTENT_FILTER_VERIFICATION_AGENT) public abstract void verifyIntentFilter(int, int, @NonNull java.util.List<java.lang.String>);

    method @Deprecated @RequiresPermission(android.Manifest.permission.INTENT_FILTER_VERIFICATION_AGENT) public abstract void verifyIntentFilter(int, int, @NonNull java.util.List<java.lang.String>);

    field public static final String ACTION_REQUEST_PERMISSIONS = "android.content.pm.action.REQUEST_PERMISSIONS";

    field public static final String EXTRA_REQUEST_PERMISSIONS_NAMES = "android.content.pm.extra.REQUEST_PERMISSIONS_NAMES";

    field public static final String EXTRA_REQUEST_PERMISSIONS_RESULTS = "android.content.pm.extra.REQUEST_PERMISSIONS_RESULTS";
@@ -2581,13 +2581,13 @@ package android.content.pm { 
    field public static final int INSTALL_PARSE_FAILED_NO_CERTIFICATES = -103; // 0xffffff99

    field public static final int INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION = -102; // 0xffffff9a

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

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

    field public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK = 4; // 0x4

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

    field public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER = 3; // 0x3

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

    field public static final int INTENT_FILTER_VERIFICATION_FAILURE = -1; // 0xffffffff

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

    field @Deprecated public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS = 2; // 0x2

    field @Deprecated public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK = 4; // 0x4

    field @Deprecated public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK = 1; // 0x1

    field @Deprecated public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER = 3; // 0x3

    field @Deprecated public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED = 0; // 0x0

    field @Deprecated public static final int INTENT_FILTER_VERIFICATION_FAILURE = -1; // 0xffffffff

    field @Deprecated public static final int INTENT_FILTER_VERIFICATION_SUCCESS = 1; // 0x1

    field @Deprecated public static final int MASK_PERMISSION_FLAGS = 255; // 0xff

    field public static final int MATCH_ANY_USER = 4194304; // 0x400000

    field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000

core/java/android/content/Intent.java

+5 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.ResolveInfo;

import android.content.pm.ShortcutInfo;

import android.content.pm.SuspendDialogInfo;

import android.content.pm.domain.verify.DomainVerificationManager;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.graphics.Rect;
@@ -2841,10 +2842,13 @@ public class Intent implements Parcelable, Cloneable { 
     * </p>

     *

     * @hide

     * @deprecated Superseded by domain verification APIs. See {@link DomainVerificationManager}.

     */

    @Deprecated

    @SystemApi

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_INTENT_FILTER_NEEDS_VERIFICATION = "android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION";

    public static final String ACTION_INTENT_FILTER_NEEDS_VERIFICATION =

            "android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION";





    /**

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

+4 −0
Original line number Diff line number Diff line
@@ -627,9 +627,13 @@ interface IPackageManager { 
    void verifyPendingInstall(int id, int verificationCode);

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



    /** @deprecated */

    void verifyIntentFilter(int id, int verificationCode, in List<String> failedDomains);

    /** @deprecated */

    int getIntentVerificationStatus(String packageName, int userId);

    /** @deprecated */

    boolean updateIntentVerificationStatus(String packageName, int status, int userId);

    /** @deprecated */

    ParceledListSlice getIntentFilterVerifications(String packageName);

    ParceledListSlice getAllIntentFilters(String packageName);

core/java/android/content/pm/PackageManager.java

+40 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.IntentSender;

import android.content.pm.verify.domain.DomainVerificationManager;

import android.content.pm.dex.ArtManager;

import android.content.res.Configuration;

import android.content.res.Resources;
@@ -93,6 +94,7 @@ import java.util.List; 
import java.util.Locale;

import java.util.Objects;

import java.util.Set;

import java.util.UUID;



/**

 * Class for retrieving various kinds of information related to the application
@@ -2201,8 +2203,10 @@ public abstract class PackageManager { 
     * {@link PackageManager#verifyIntentFilter} to indicate that the calling

     * IntentFilter Verifier confirms that the IntentFilter is verified.

     *

     * @deprecated Use {@link DomainVerificationManager} APIs.

     * @hide

     */

    @Deprecated

    @SystemApi

    public static final int INTENT_FILTER_VERIFICATION_SUCCESS = 1;
@@ -2211,16 +2215,20 @@ public abstract class PackageManager { 
     * {@link PackageManager#verifyIntentFilter} to indicate that the calling

     * IntentFilter Verifier confirms that the IntentFilter is NOT verified.

     *

     * @deprecated Use {@link DomainVerificationManager} APIs.

     * @hide

     */

    @Deprecated

    @SystemApi

    public static final int INTENT_FILTER_VERIFICATION_FAILURE = -1;



    /**

     * Internal status code to indicate that an IntentFilter verification result is not specified.

     *

     * @deprecated Use {@link DomainVerificationManager} APIs.

     * @hide

     */

    @Deprecated

    @SystemApi

    public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED = 0;
@@ -2230,8 +2238,10 @@ public abstract class PackageManager { 
     * will always be prompted the Intent Disambiguation Dialog if there are two

     * or more Intent resolved for the IntentFilter's domain(s).

     *

     * @deprecated Use {@link DomainVerificationManager} APIs.

     * @hide

     */

    @Deprecated

    @SystemApi

    public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK = 1;
@@ -2242,8 +2252,10 @@ public abstract class PackageManager { 
     * or more resolution of the Intent. The default App for the domain(s)

     * specified in the IntentFilter will also ALWAYS be used.

     *

     * @deprecated Use {@link DomainVerificationManager} APIs.

     * @hide

     */

    @Deprecated

    @SystemApi

    public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS = 2;
@@ -2254,8 +2266,10 @@ public abstract class PackageManager { 
     * Intent resolved. The default App for the domain(s) specified in the

     * IntentFilter will also NEVER be presented to the User.

     *

     * @deprecated Use {@link DomainVerificationManager} APIs.

     * @hide

     */

    @Deprecated

    @SystemApi

    public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER = 3;
@@ -2268,8 +2282,10 @@ public abstract class PackageManager { 
     * more than one candidate app, then a disambiguation is *always* presented

     * even if there is another candidate app with the 'always' state.

     *

     * @deprecated Use {@link DomainVerificationManager} APIs.

     * @hide

     */

    @Deprecated

    @SystemApi

    public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK = 4;
@@ -3743,8 +3759,10 @@ public abstract class PackageManager { 
     * Passed to an intent filter verifier and is used to call back to

     * {@link #verifyIntentFilter}

     *

     * @deprecated Use {@link DomainVerificationManager} APIs.

     * @hide

     */

    @Deprecated

    public static final String EXTRA_INTENT_FILTER_VERIFICATION_ID

            = "android.content.pm.extra.INTENT_FILTER_VERIFICATION_ID";
@@ -3754,8 +3772,10 @@ public abstract class PackageManager { 
     *

     * Usually this is "https"

     *

     * @deprecated Use {@link DomainVerificationManager} APIs.

     * @hide

     */

    @Deprecated

    public static final String EXTRA_INTENT_FILTER_VERIFICATION_URI_SCHEME

            = "android.content.pm.extra.INTENT_FILTER_VERIFICATION_URI_SCHEME";
@@ -3766,8 +3786,10 @@ public abstract class PackageManager { 
     *

     * This is a space delimited list of hosts.

     *

     * @deprecated Use {@link DomainVerificationManager} APIs.

     * @hide

     */

    @Deprecated

    public static final String EXTRA_INTENT_FILTER_VERIFICATION_HOSTS

            = "android.content.pm.extra.INTENT_FILTER_VERIFICATION_HOSTS";
@@ -3777,8 +3799,10 @@ public abstract class PackageManager { 
     * from the hosts. Each host response will need to include the package name of APK containing

     * the intent filter.

     *

     * @deprecated Use {@link DomainVerificationManager} APIs.

     * @hide

     */

    @Deprecated

    public static final String EXTRA_INTENT_FILTER_VERIFICATION_PACKAGE_NAME

            = "android.content.pm.extra.INTENT_FILTER_VERIFICATION_PACKAGE_NAME";
@@ -6956,8 +6980,10 @@ public abstract class PackageManager { 
     * @throws SecurityException if the caller does not have the

     *            INTENT_FILTER_VERIFICATION_AGENT permission.

     *

     * @deprecated Use {@link DomainVerificationManager} APIs.

     * @hide

     */

    @Deprecated

    @SuppressWarnings("HiddenAbstractMethod")

    @SystemApi

    @RequiresPermission(android.Manifest.permission.INTENT_FILTER_VERIFICATION_AGENT)
@@ -6982,8 +7008,10 @@ public abstract class PackageManager { 
     *              {@link #INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER} or

     *              {@link #INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED}

     *

     * @deprecated Use {@link DomainVerificationManager} APIs.

     * @hide

     */

    @Deprecated

    @SuppressWarnings("HiddenAbstractMethod")

    @SystemApi

    @RequiresPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL)
@@ -7008,8 +7036,18 @@ public abstract class PackageManager { 
     *

     * @return true if the status has been set. False otherwise.

     *

     * @deprecated This API represents a very dangerous behavior where Settings or a system app with

     * the right permissions can force an application to be verified for all of its declared

     * domains. This has been removed to prevent unintended usage, and no longer does anything,

     * always returning false. If a caller truly wishes to grant <i></i>every</i> declared web

     * domain to an application, use

     * {@link DomainVerificationManager#setDomainVerificationUserSelection(UUID, Set, boolean)},

     * passing in all of the domains returned inside

     * {@link DomainVerificationManager#getDomainVerificationUserSelection(String)}.

     *

     * @hide

     */

    @Deprecated

    @SuppressWarnings("HiddenAbstractMethod")

    @SystemApi

    @RequiresPermission(android.Manifest.permission.SET_PREFERRED_APPLICATIONS)
@@ -7026,8 +7064,10 @@ public abstract class PackageManager { 
     *

     * @return a list of IntentFilterVerificationInfo for a specific package.

     *

     * @deprecated Use {@link DomainVerificationManager} instead.

     * @hide

     */

    @Deprecated

    @SuppressWarnings("HiddenAbstractMethod")

    @NonNull

    @SystemApi

core/java/android/content/pm/parsing/ParsingPackageUtils.java

+4 −0
Original line number Diff line number Diff line
@@ -2493,6 +2493,10 @@ public class ParsingPackageUtils { 


    /**

     * Check if one of the IntentFilter as both actions DEFAULT / VIEW and a HTTP/HTTPS data URI

     *

     * This is distinct from any of the functionality of app links domain verification, and cannot

     * be converted to remain backwards compatible. It's possible the presence of this flag does

     * not indicate a valid package for domain verification.

     */

    private static boolean hasDomainURLs(ParsingPackage pkg) {

        final List<ParsedActivity> activities = pkg.getActivities();