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

Commit 0af5b335 authored by Winson's avatar Winson
Browse files

Rename to DomainVerificationUserState 

Better reflects the fact that the map no longer contains only the
selection state, but the domain state in general for the user.

Bug: 181637637

Test: none, naming refactor

Change-Id: I28bc73906f764d83c258fa10e23f2821e9482419
parent e448e546

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -12950,17 +12950,17 @@ package android.content.pm { 
package android.content.pm.verify.domain {















  public final class DomainVerificationManager {













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













    method @Nullable public android.content.pm.verify.domain.DomainVerificationUserState getDomainVerificationUserState(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;















  }



























  public final class DomainVerificationUserSelection implements android.os.Parcelable {













  public final class DomainVerificationUserState implements android.os.Parcelable {















    method public int describeContents();















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















    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;













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















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















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















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

























core/api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -2791,7 +2791,7 @@ package android.content.pm.verify.domain {













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















  }



























  public final class DomainVerificationUserSelection implements android.os.Parcelable {













  public final class DomainVerificationUserState implements android.os.Parcelable {















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















  }















































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



+1
−1




























Original line number
Diff line number
Diff line








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













     * domain to an application, use















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















     * passing in all of the domains returned inside













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













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















     *















     * @hide















     */

































core/java/android/content/pm/verify/domain/DomainOwner.java



+5
−21




























Original line number
Diff line number
Diff line








@@ -66,16 +66,7 @@ public final class DomainOwner implements Parcelable {













     * @param packageName















     *   Package name of that owns the domain.















     * @param overrideable













     *   Whether or not this owner can be automatically overridden. If all owners for a domain are













     *   overrideable, then calling













     *   {@link DomainVerificationManager#setDomainVerificationUserSelection(UUID,













     *   Set, boolean)} to enable the domain will disable all other owners. On the other hand, if any













     *   of the owners are non-overrideable, then













     *   {@link DomainVerificationManager#setDomainVerificationLinkHandlingAllowed(String,













     *   boolean)} must be called with false to disable all of the other owners before this domain can













     *   be taken by a new owner through













     *   {@link DomainVerificationManager#setDomainVerificationUserSelection(UUID,













     *   Set, boolean)}.













     *   Whether or not this owner can be automatically overridden.















     */















    @DataClass.Generated.Member















    public DomainOwner(









@@ -98,16 +89,9 @@ public final class DomainOwner implements Parcelable {













    }































    /**













     * Whether or not this owner can be automatically overridden. If all owners for a domain are













     * overrideable, then calling













     * {@link DomainVerificationManager#setDomainVerificationUserSelection(UUID,













     * Set, boolean)} to enable the domain will disable all other owners. On the other hand, if any













     * of the owners are non-overrideable, then













     * {@link DomainVerificationManager#setDomainVerificationLinkHandlingAllowed(String,













     * boolean)} must be called with false to disable all of the other owners before this domain can













     * be taken by a new owner through













     * {@link DomainVerificationManager#setDomainVerificationUserSelection(UUID,













     * Set, boolean)}.













     * Whether or not this owner can be automatically overridden.













     *













     * @see DomainVerificationManager#setDomainVerificationUserSelection(UUID, Set, boolean)















     */















    @DataClass.Generated.Member















    public boolean isOverrideable() {










@@ -205,7 +189,7 @@ public final class DomainOwner implements Parcelable {













    };































    @DataClass.Generated(













            time = 1614119379978L,













            time = 1614721802044L,















            codegenVersion = "1.0.22",















            sourceFile = "frameworks/base/core/java/android/content/pm/verify/domain/DomainOwner.java",















            inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final  boolean mOverrideable\nclass DomainOwner extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genParcelable=true, genEqualsHashCode=true, genAidl=true, genToString=true)")

































core/java/android/content/pm/verify/domain/DomainVerificationInfo.java



+3
−4




























Original line number
Diff line number
Diff line








@@ -94,7 +94,7 @@ public final class DomainVerificationInfo implements Parcelable {





























    private Map<String, Integer> unparcelHostToStateMap(Parcel in) {















        return DomainVerificationUtils.readHostMap(in, new ArrayMap<>(),













                DomainVerificationUserSelection.class.getClassLoader());













                DomainVerificationUserState.class.getClassLoader());















    }









































@@ -105,8 +105,7 @@ public final class DomainVerificationInfo implements Parcelable {













    // CHECKSTYLE:OFF Generated code















    //















    // To regenerate run:













    // $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/content/pm/verify/domain













    // /DomainVerificationInfo.java













    // $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/content/pm/verify/domain/DomainVerificationInfo.java















    //















    // To exclude the generated code from IntelliJ auto-formatting enable (one-time):















    //   Settings > Editor > Code Style > Formatter Control










@@ -321,7 +320,7 @@ public final class DomainVerificationInfo implements Parcelable {













    };































    @DataClass.Generated(













            time = 1613002530369L,













            time = 1614721812023L,















            codegenVersion = "1.0.22",















            sourceFile = "frameworks/base/core/java/android/content/pm/verify/domain/DomainVerificationInfo.java",















            inputSignatures = "private final @android.annotation.NonNull @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForUUID.class) java.util.UUID mIdentifier\nprivate final @android.annotation.NonNull java.lang.String mPackageName\nprivate final @android.annotation.NonNull java.util.Map<java.lang.String,java.lang.Integer> mHostToStateMap\nprivate  void parcelHostToStateMap(android.os.Parcel,int)\nprivate  java.util.Map<java.lang.String,java.lang.Integer> unparcelHostToStateMap(android.os.Parcel)\nclass DomainVerificationInfo extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genAidl=true, genHiddenConstructor=true, genParcelable=true, genToString=true, genEqualsHashCode=true)")