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

Commit ee612e99 authored by Winson's avatar Winson
Browse files

Address domain verification API comments 

Changes package to pm.verify.domain, removes throwing InvalidDomainSet,
cleans up permissions, and renames DomainVerificationSet ->
DomainVerificationInfo.

Bug: 163565712
CTS-Coverage-Bug: 179382047

Test: atest com.android.server.pm.test.verify.domain

Change-Id: I5d60c227f0e529fe27c1844ada97716933a533b0
parent 3c7113a4

core/api/system-current.txt

+32 −42
Original line number Diff line number Diff line
@@ -2701,47 +2701,51 @@ package android.content.pm.dex { 














}



























package android.content.pm.domain.verify {













package android.content.pm.permission {

























  @Deprecated public final class RuntimePermissionPresentationInfo implements android.os.Parcelable {













    ctor @Deprecated public RuntimePermissionPresentationInfo(CharSequence, boolean, boolean);













    method @Deprecated public int describeContents();













    method @Deprecated @NonNull public CharSequence getLabel();













    method @Deprecated public boolean isGranted();













    method @Deprecated public boolean isStandard();













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













    field @Deprecated @NonNull public static final android.os.Parcelable.Creator<android.content.pm.permission.RuntimePermissionPresentationInfo> CREATOR;













  }

























}

























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(allOf={android.Manifest.permission.DOMAIN_VERIFICATION_AGENT, android.Manifest.permission.QUERY_ALL_PACKAGES, android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION}, conditional=true) public android.content.pm.domain.verify.DomainVerificationSet getDomainVerificationSet(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;













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













    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.DOMAIN_VERIFICATION_AGENT, android.Manifest.permission.QUERY_ALL_PACKAGES}) public java.util.List<java.lang.String> getValidVerificationPackageNames();













    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(allOf={android.Manifest.permission.DOMAIN_VERIFICATION_AGENT, android.Manifest.permission.QUERY_ALL_PACKAGES}) public void setDomainVerificationStatus(@NonNull java.util.UUID, @NonNull java.util.Set<java.lang.String>, int) throws android.content.pm.domain.verify.DomainVerificationManager.InvalidDomainSetException, 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.domain.verify.DomainVerificationManager.InvalidDomainSetException, android.content.pm.PackageManager.NameNotFoundException;













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













    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 static class DomainVerificationManager.InvalidDomainSetException extends android.util.AndroidException {













    method @Nullable public java.util.UUID getDomainSetId();













    method @Nullable public String getPackageName();













    method public int getReason();













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













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













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













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













  }



























  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.domain.verify.DomainVerificationRequest> CREATOR;













  }

























  public final class DomainVerificationSet 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.domain.verify.DomainVerificationSet> CREATOR;













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















  }





























  public final class DomainVerificationUserSelection implements android.os.Parcelable {









@@ -2752,21 +2756,7 @@ package android.content.pm.domain.verify {













    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.domain.verify.DomainVerificationUserSelection> CREATOR;













  }

























}

























package android.content.pm.permission {

























  @Deprecated public final class RuntimePermissionPresentationInfo implements android.os.Parcelable {













    ctor @Deprecated public RuntimePermissionPresentationInfo(CharSequence, boolean, boolean);













    method @Deprecated public int describeContents();













    method @Deprecated @NonNull public CharSequence getLabel();













    method @Deprecated public boolean isGranted();













    method @Deprecated public boolean isStandard();













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













    field @Deprecated @NonNull public static final android.os.Parcelable.Creator<android.content.pm.permission.RuntimePermissionPresentationInfo> CREATOR;













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















  }





























}

































core/java/android/app/SystemServiceRegistry.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -69,9 +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.domain.verify.DomainVerificationManager;













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













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













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;

































core/java/android/content/Intent.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -37,7 +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.pm.verify.domain.DomainVerificationManager;















import android.content.res.Resources;















import android.content.res.TypedArray;















import android.graphics.Rect;

































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



+4
−4




























Original line number
Diff line number
Diff line








@@ -3759,7 +3759,7 @@ public abstract class PackageManager {













     * Passed to an intent filter verifier and is used to call back to















     * {@link #verifyIntentFilter}















     *













     * @deprecated Use {@link DomainVerificationManager} APIs.













     * @deprecated Use DomainVerificationManager APIs.















     * @hide















     */















    @Deprecated









@@ -3772,7 +3772,7 @@ public abstract class PackageManager {













     *















     * Usually this is "https"















     *













     * @deprecated Use {@link DomainVerificationManager} APIs.













     * @deprecated Use DomainVerificationManager APIs.















     * @hide















     */















    @Deprecated









@@ -3786,7 +3786,7 @@ public abstract class PackageManager {













     *















     * This is a space delimited list of hosts.















     *













     * @deprecated Use {@link DomainVerificationManager} APIs.













     * @deprecated Use DomainVerificationManager APIs.















     * @hide















     */















    @Deprecated









@@ -3799,7 +3799,7 @@ 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.













     * @deprecated Use DomainVerificationManager APIs.















     * @hide















     */















    @Deprecated

































core/java/android/content/pm/domain/verify/DomainVerificationSet.aidl→core/java/android/content/pm/verify/domain/DomainVerificationInfo.aidl



+2
−2




























Original line number
Diff line number
Diff line








@@ -14,6 +14,6 @@













 * limitations under the License.















 */





























package android.content.pm.domain.verify;













package android.content.pm.verify.domain;





























parcelable DomainVerificationSet;












parcelable DomainVerificationInfo;