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

Commit bb85ae96 authored by Winson Chiu's avatar Winson Chiu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "domain-verify-sc-dev" into sc-dev 

* changes:
  Address domain verification API comments
  Remove legacy IntentFilterVerificationManager
  Convert DomainVerificationService.Connection to synchronous set
  Migrate legacy intent filter verification settings
  Combine v1 and v2 DomainVerficationProxies
  Add DomainVerificationProxyV1
  Use new always open during PMS Activity resolution
  Add DomainVerificationShell and boot broadcast
  Add DomainVerificationDebug
  Implement domain verification core system APIs
  Add DomainVerificationEnforcer
  Add DomainVerificationProxyV2 for new APIs
  Attach domain verification states during package scan/install
  Add DomainVerificationSettings write/read to Settings
  Wire up DomainVerificationService to PackageManagerService
  Add DomainVerificationCollector
  Add DomainVerificationPersistence
  Add DomainVerificationService skeleton
  Add DomainVerificationManager
  Add new domain verification permissions
  Add internal domain verification data classes
  Add domain verification API classes
  Refactor legacy domain verification code
parents 1aee2013 ee612e99

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -45795,6 +45795,8 @@ package android.util { 
    method public void clear();

    method public android.util.SparseArray<E> clone();

    method public boolean contains(int);

    method public boolean contentEquals(@Nullable android.util.SparseArray<E>);

    method public int contentHashCode();

    method public void delete(int);

    method public E get(int);

    method public E get(int, E);

core/api/system-current.txt

+63 −12
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ package android { 
    field public static final String BIND_CONTENT_CAPTURE_SERVICE = "android.permission.BIND_CONTENT_CAPTURE_SERVICE";

    field public static final String BIND_CONTENT_SUGGESTIONS_SERVICE = "android.permission.BIND_CONTENT_SUGGESTIONS_SERVICE";

    field public static final String BIND_DIRECTORY_SEARCH = "android.permission.BIND_DIRECTORY_SEARCH";

    field public static final String BIND_DOMAIN_VERIFICATION_AGENT = "android.permission.BIND_DOMAIN_VERIFICATION_AGENT";

    field public static final String BIND_EUICC_SERVICE = "android.permission.BIND_EUICC_SERVICE";

    field public static final String BIND_EXTERNAL_STORAGE_SERVICE = "android.permission.BIND_EXTERNAL_STORAGE_SERVICE";

    field public static final String BIND_GBA_SERVICE = "android.permission.BIND_GBA_SERVICE";
@@ -86,6 +87,7 @@ package android { 
    field public static final String CRYPT_KEEPER = "android.permission.CRYPT_KEEPER";

    field public static final String DEVICE_POWER = "android.permission.DEVICE_POWER";

    field public static final String DISPATCH_PROVISIONING_MESSAGE = "android.permission.DISPATCH_PROVISIONING_MESSAGE";

    field public static final String DOMAIN_VERIFICATION_AGENT = "android.permission.DOMAIN_VERIFICATION_AGENT";

    field public static final String ENTER_CAR_MODE_PRIORITIZED = "android.permission.ENTER_CAR_MODE_PRIORITIZED";

    field public static final String EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS = "android.permission.EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS";

    field public static final String FORCE_BACK = "android.permission.FORCE_BACK";
@@ -258,6 +260,7 @@ package android { 
    field public static final String TV_VIRTUAL_REMOTE_CONTROLLER = "android.permission.TV_VIRTUAL_REMOTE_CONTROLLER";

    field public static final String UNLIMITED_SHORTCUTS_API_CALLS = "android.permission.UNLIMITED_SHORTCUTS_API_CALLS";

    field public static final String UPDATE_APP_OPS_STATS = "android.permission.UPDATE_APP_OPS_STATS";

    field public static final String UPDATE_DOMAIN_VERIFICATION_USER_SELECTION = "android.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION";

    field public static final String UPDATE_FONTS = "android.permission.UPDATE_FONTS";

    field public static final String UPDATE_LOCK = "android.permission.UPDATE_LOCK";

    field public static final String UPDATE_TIME_ZONE_RULES = "android.permission.UPDATE_TIME_ZONE_RULES";
@@ -2100,6 +2103,7 @@ package android.content { 
    field public static final int BIND_ALLOW_FOREGROUND_SERVICE_STARTS_FROM_BACKGROUND = 262144; // 0x40000

    field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";

    field public static final String CONTEXTHUB_SERVICE = "contexthub";

    field public static final String DOMAIN_VERIFICATION_SERVICE = "domain_verification";

    field public static final String ETHERNET_SERVICE = "ethernet";

    field public static final String EUICC_CARD_SERVICE = "euicc_card";

    field public static final String FONT_SERVICE = "font";
@@ -2143,12 +2147,13 @@ package android.content { 
    field public static final String ACTION_CALL_PRIVILEGED = "android.intent.action.CALL_PRIVILEGED";

    field public static final String ACTION_DEVICE_CUSTOMIZATION_READY = "android.intent.action.DEVICE_CUSTOMIZATION_READY";

    field public static final String ACTION_DIAL_EMERGENCY = "android.intent.action.DIAL_EMERGENCY";

    field public static final String ACTION_DOMAINS_NEED_VERIFICATION = "android.intent.action.DOMAINS_NEED_VERIFICATION";

    field public static final String ACTION_FACTORY_RESET = "android.intent.action.FACTORY_RESET";

    field public static final String ACTION_GLOBAL_BUTTON = "android.intent.action.GLOBAL_BUTTON";

    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";
@@ -2481,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);
@@ -2506,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";
@@ -2576,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
@@ -2710,6 +2715,52 @@ package android.content.pm.permission { 














}



























package android.content.pm.verify.domain {

























  public final class DomainVerificationInfo implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public java.util.Map<java.lang.String,java.lang.Integer> getHostToStateMap();













    method @NonNull public java.util.UUID getIdentifier();













    method @NonNull public String getPackageName();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.verify.domain.DomainVerificationInfo> CREATOR;













  }

























  public interface DomainVerificationManager {













    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.DOMAIN_VERIFICATION_AGENT, android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION}) public android.content.pm.verify.domain.DomainVerificationInfo getDomainVerificationInfo(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;













    method @Nullable @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public android.content.pm.verify.domain.DomainVerificationUserSelection getDomainVerificationUserSelection(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;













    method @NonNull @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public java.util.List<java.lang.String> getValidVerificationPackageNames();













    method public static boolean isStateModifiable(int);













    method public static boolean isStateVerified(int);













    method @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public void setDomainVerificationLinkHandlingAllowed(@NonNull String, boolean) throws android.content.pm.PackageManager.NameNotFoundException;













    method @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT) public void setDomainVerificationStatus(@NonNull java.util.UUID, @NonNull java.util.Set<java.lang.String>, int) throws android.content.pm.PackageManager.NameNotFoundException;













    method @RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION) public void setDomainVerificationUserSelection(@NonNull java.util.UUID, @NonNull java.util.Set<java.lang.String>, boolean) throws android.content.pm.PackageManager.NameNotFoundException;













    field public static final String EXTRA_VERIFICATION_REQUEST = "android.content.pm.verify.domain.extra.VERIFICATION_REQUEST";













    field public static final int STATE_FIRST_VERIFIER_DEFINED = 1024; // 0x400













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













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













  }

























  public final class DomainVerificationRequest implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public java.util.Set<java.lang.String> getPackageNames();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.verify.domain.DomainVerificationRequest> CREATOR;













  }

























  public final class DomainVerificationUserSelection implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public java.util.Map<java.lang.String,java.lang.Boolean> getHostToUserSelectionMap();













    method @NonNull public java.util.UUID getIdentifier();













    method @NonNull public String getPackageName();













    method @NonNull public android.os.UserHandle getUser();













    method @NonNull public boolean isLinkHandlingAllowed();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.verify.domain.DomainVerificationUserSelection> CREATOR;













  }

























}



























package android.content.rollback {





























  public final class PackageRollbackInfo implements android.os.Parcelable {

































core/java/android/app/SystemServiceRegistry.java



+17
−0




























Original line number
Diff line number
Diff line








@@ -69,6 +69,9 @@ import android.content.pm.IShortcutService;













import android.content.pm.LauncherApps;















import android.content.pm.PackageManager;















import android.content.pm.ShortcutManager;













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













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













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















import android.content.res.Resources;















import android.content.rollback.RollbackManagerFrameworkInitializer;















import android.debug.AdbManager;










@@ -1388,6 +1391,20 @@ public final class SystemServiceRegistry {













                    }















                });





























        // TODO(b/159952358): Only register this service for the domain verification agent?













        registerService(Context.DOMAIN_VERIFICATION_SERVICE, DomainVerificationManager.class,













                new CachedServiceFetcher<DomainVerificationManager>() {













                    @Override













                    public DomainVerificationManager createService(ContextImpl context)













                            throws ServiceNotFoundException {













                        IBinder binder = ServiceManager.getServiceOrThrow(













                                Context.DOMAIN_VERIFICATION_SERVICE);













                        IDomainVerificationManager service =













                                IDomainVerificationManager.Stub.asInterface(binder);













                        return new DomainVerificationManagerImpl(context, service);













                    }













                });





























        sInitializing = true;















        try {















            // Note: the following functions need to be @SystemApis, once they become mainline

































core/java/android/content/Context.java



+9
−0




























Original line number
Diff line number
Diff line








@@ -5450,6 +5450,15 @@ public abstract class Context {













     */















    public static final String GAME_SERVICE = "game";





























    /**













     * Use with {@link #getSystemService(String)} to access domain verification service.













     *













     * @see #getSystemService(String)













     * @hide













     */













    @SystemApi













    public static final String DOMAIN_VERIFICATION_SERVICE = "domain_verification";





























    /**















     * Determine whether the given permission is allowed for a particular















     * process and user ID running in the system.

































core/java/android/content/Intent.java



+20
−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.verify.domain.DomainVerificationManager;















import android.content.res.Resources;















import android.content.res.TypedArray;















import android.graphics.Rect;










@@ -2841,10 +2842,28 @@ 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";









































    /**













     * Broadcast Action: Sent to the system domain verification agent when an app's domains need













     * to be verified. The data contains the domains hosts to be verified against.













     * <p class="note">













     * This is a protected intent that can only be sent by the system.













     * </p>













     *













     * @hide















     */















    @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_DOMAINS_NEED_VERIFICATION =













            "android.intent.action.DOMAINS_NEED_VERIFICATION";































    /**















     * Broadcast Action: Resources for a set of packages (which were