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
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 9d8accb..10423a6 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -2701,62 +2701,6 @@
}
-package android.content.pm.domain.verify {
-
- 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 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";
- 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;
- }
-
- 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.domain.verify.DomainVerificationUserSelection> CREATOR;
- }
-
-}
-
package android.content.pm.permission {
@Deprecated public final class RuntimePermissionPresentationInfo implements android.os.Parcelable {
@@ -2771,6 +2715,52 @@
}
+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 {
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index a7f8331..7404e53 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -69,9 +69,9 @@
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;
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index b6d5ac6..30b2404 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -37,7 +37,7 @@
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;
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index abe7b48..d09d83f 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -3759,7 +3759,7 @@
* 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 @@
*
* Usually this is "https"
*
- * @deprecated Use {@link DomainVerificationManager} APIs.
+ * @deprecated Use DomainVerificationManager APIs.
* @hide
*/
@Deprecated
@@ -3786,7 +3786,7 @@
*
* This is a space delimited list of hosts.
*
- * @deprecated Use {@link DomainVerificationManager} APIs.
+ * @deprecated Use DomainVerificationManager APIs.
* @hide
*/
@Deprecated
@@ -3799,7 +3799,7 @@
* 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
diff --git a/core/java/android/content/pm/domain/verify/DomainVerificationSet.aidl b/core/java/android/content/pm/verify/domain/DomainVerificationInfo.aidl
similarity index 88%
rename from core/java/android/content/pm/domain/verify/DomainVerificationSet.aidl
rename to core/java/android/content/pm/verify/domain/DomainVerificationInfo.aidl
index 0208907..c143cc5 100644
--- a/core/java/android/content/pm/domain/verify/DomainVerificationSet.aidl
+++ b/core/java/android/content/pm/verify/domain/DomainVerificationInfo.aidl
@@ -14,6 +14,6 @@
* limitations under the License.
*/
-package android.content.pm.domain.verify;
+package android.content.pm.verify.domain;
-parcelable DomainVerificationSet;
+parcelable DomainVerificationInfo;
diff --git a/core/java/android/content/pm/domain/verify/DomainVerificationSet.java b/core/java/android/content/pm/verify/domain/DomainVerificationInfo.java
similarity index 79%
rename from core/java/android/content/pm/domain/verify/DomainVerificationSet.java
rename to core/java/android/content/pm/verify/domain/DomainVerificationInfo.java
index bc07650..7afbe1f 100644
--- a/core/java/android/content/pm/domain/verify/DomainVerificationSet.java
+++ b/core/java/android/content/pm/verify/domain/DomainVerificationInfo.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.content.pm.domain.verify;
+package android.content.pm.verify.domain;
import android.annotation.NonNull;
import android.annotation.SystemApi;
@@ -42,25 +42,22 @@
@SuppressWarnings("DefaultAnnotationParam")
@DataClass(genAidl = true, genHiddenConstructor = true, genParcelable = true, genToString = true,
genEqualsHashCode = true)
-public final class DomainVerificationSet implements Parcelable {
+public final class DomainVerificationInfo implements Parcelable {
/**
- * A domain verification ID for use in later API calls. This represents the snapshot
- * of the domains for a package on device, and will be invalidated whenever the
- * package changes.
+ * A domain verification ID for use in later API calls. This represents the snapshot of the
+ * domains for a package on device, and will be invalidated whenever the package changes.
* <p>
- * An exception will be thrown at the next API call that receives the ID if it is no
- * longer valid.
+ * An exception will be thrown at the next API call that receives the ID if it is no longer
+ * valid.
* <p>
- * The caller may also be notified with a broadcast whenever a package and ID is
- * invalidated, at which point it can use the package name to evict existing
- * requests with an invalid set ID. If the caller wants to manually check if any
- * IDs have been invalidate, the {@link PackageManager#getChangedPackages(int)}
- * API will allow tracking the packages changed since the last query of this
- * method, prompting the caller to re-query.
+ * The caller may also be notified with a broadcast whenever a package and ID is invalidated, at
+ * which point it can use the package name to evict existing requests with an invalid set ID. If
+ * the caller wants to manually check if any IDs have been invalidate, the {@link
+ * PackageManager#getChangedPackages(int)} API will allow tracking the packages changed since
+ * the last query of this method, prompting the caller to re-query.
* <p>
- * This allows the caller to arbitrarily grant or revoke domain verification
- * status, through
+ * This allows the caller to arbitrarily grant or revoke domain verification status, through
* {@link DomainVerificationManager#setDomainVerificationStatus(UUID, Set, int)}.
*/
@NonNull
@@ -98,7 +95,7 @@
// CHECKSTYLE:OFF Generated code
//
// To regenerate run:
- // $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/content/pm/domain/verify/DomainVerificationSet.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
@@ -106,25 +103,22 @@
/**
- * Creates a new DomainVerificationSet.
+ * Creates a new DomainVerificationInfo.
*
* @param identifier
- * A domain verification ID for use in later API calls. This represents the snapshot
- * of the domains for a package on device, and will be invalidated whenever the
- * package changes.
+ * A domain verification ID for use in later API calls. This represents the snapshot of the
+ * domains for a package on device, and will be invalidated whenever the package changes.
* <p>
- * An exception will be thrown at the next API call that receives the ID if it is no
- * longer valid.
+ * An exception will be thrown at the next API call that receives the ID if it is no longer
+ * valid.
* <p>
- * The caller may also be notified with a broadcast whenever a package and ID is
- * invalidated, at which point it can use the package name to evict existing
- * requests with an invalid set ID. If the caller wants to manually check if any
- * IDs have been invalidate, the {@link PackageManager#getChangedPackages(int)}
- * API will allow tracking the packages changed since the last query of this
- * method, prompting the caller to re-query.
+ * The caller may also be notified with a broadcast whenever a package and ID is invalidated, at
+ * which point it can use the package name to evict existing requests with an invalid set ID. If
+ * the caller wants to manually check if any IDs have been invalidate, the {@link
+ * PackageManager#getChangedPackages(int)} API will allow tracking the packages changed since
+ * the last query of this method, prompting the caller to re-query.
* <p>
- * This allows the caller to arbitrarily grant or revoke domain verification
- * status, through
+ * This allows the caller to arbitrarily grant or revoke domain verification status, through
* {@link DomainVerificationManager#setDomainVerificationStatus(UUID, Set, int)}.
* @param packageName
* The package name that this data corresponds to.
@@ -144,7 +138,7 @@
* @hide
*/
@DataClass.Generated.Member
- public DomainVerificationSet(
+ public DomainVerificationInfo(
@NonNull UUID identifier,
@NonNull String packageName,
@NonNull Map<String,Integer> hostToStateMap) {
@@ -162,22 +156,19 @@
}
/**
- * A domain verification ID for use in later API calls. This represents the snapshot
- * of the domains for a package on device, and will be invalidated whenever the
- * package changes.
+ * A domain verification ID for use in later API calls. This represents the snapshot of the
+ * domains for a package on device, and will be invalidated whenever the package changes.
* <p>
- * An exception will be thrown at the next API call that receives the ID if it is no
- * longer valid.
+ * An exception will be thrown at the next API call that receives the ID if it is no longer
+ * valid.
* <p>
- * The caller may also be notified with a broadcast whenever a package and ID is
- * invalidated, at which point it can use the package name to evict existing
- * requests with an invalid set ID. If the caller wants to manually check if any
- * IDs have been invalidate, the {@link PackageManager#getChangedPackages(int)}
- * API will allow tracking the packages changed since the last query of this
- * method, prompting the caller to re-query.
+ * The caller may also be notified with a broadcast whenever a package and ID is invalidated, at
+ * which point it can use the package name to evict existing requests with an invalid set ID. If
+ * the caller wants to manually check if any IDs have been invalidate, the {@link
+ * PackageManager#getChangedPackages(int)} API will allow tracking the packages changed since
+ * the last query of this method, prompting the caller to re-query.
* <p>
- * This allows the caller to arbitrarily grant or revoke domain verification
- * status, through
+ * This allows the caller to arbitrarily grant or revoke domain verification status, through
* {@link DomainVerificationManager#setDomainVerificationStatus(UUID, Set, int)}.
*/
@DataClass.Generated.Member
@@ -218,7 +209,7 @@
// You can override field toString logic by defining methods like:
// String fieldNameToString() { ... }
- return "DomainVerificationSet { " +
+ return "DomainVerificationInfo { " +
"identifier = " + mIdentifier + ", " +
"packageName = " + mPackageName + ", " +
"hostToStateMap = " + mHostToStateMap +
@@ -229,13 +220,13 @@
@DataClass.Generated.Member
public boolean equals(@android.annotation.Nullable Object o) {
// You can override field equality logic by defining either of the methods like:
- // boolean fieldNameEquals(DomainVerificationSet other) { ... }
+ // boolean fieldNameEquals(DomainVerificationInfo other) { ... }
// boolean fieldNameEquals(FieldType otherValue) { ... }
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
@SuppressWarnings("unchecked")
- DomainVerificationSet that = (DomainVerificationSet) o;
+ DomainVerificationInfo that = (DomainVerificationInfo) o;
//noinspection PointlessBooleanExpression
return true
&& java.util.Objects.equals(mIdentifier, that.mIdentifier)
@@ -285,7 +276,7 @@
/** @hide */
@SuppressWarnings({"unchecked", "RedundantCast"})
@DataClass.Generated.Member
- /* package-private */ DomainVerificationSet(@NonNull android.os.Parcel in) {
+ /* package-private */ DomainVerificationInfo(@NonNull android.os.Parcel in) {
// You can override field unparcelling by defining methods like:
// static FieldType unparcelFieldName(Parcel in) { ... }
@@ -308,24 +299,24 @@
}
@DataClass.Generated.Member
- public static final @NonNull Parcelable.Creator<DomainVerificationSet> CREATOR
- = new Parcelable.Creator<DomainVerificationSet>() {
+ public static final @NonNull Parcelable.Creator<DomainVerificationInfo> CREATOR
+ = new Parcelable.Creator<DomainVerificationInfo>() {
@Override
- public DomainVerificationSet[] newArray(int size) {
- return new DomainVerificationSet[size];
+ public DomainVerificationInfo[] newArray(int size) {
+ return new DomainVerificationInfo[size];
}
@Override
- public DomainVerificationSet createFromParcel(@NonNull android.os.Parcel in) {
- return new DomainVerificationSet(in);
+ public DomainVerificationInfo createFromParcel(@NonNull android.os.Parcel in) {
+ return new DomainVerificationInfo(in);
}
};
@DataClass.Generated(
- time = 1611795504275L,
+ time = 1611862790369L,
codegenVersion = "1.0.22",
- sourceFile = "frameworks/base/core/java/android/content/pm/domain/verify/DomainVerificationSet.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\nclass DomainVerificationSet extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genAidl=true, genHiddenConstructor=true, genParcelable=true, genToString=true, genEqualsHashCode=true)")
+ 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\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)")
@Deprecated
private void __metadata() {}
diff --git a/core/java/android/content/pm/domain/verify/DomainVerificationManager.java b/core/java/android/content/pm/verify/domain/DomainVerificationManager.java
similarity index 77%
rename from core/java/android/content/pm/domain/verify/DomainVerificationManager.java
rename to core/java/android/content/pm/verify/domain/DomainVerificationManager.java
index ddae8f9..af12536 100644
--- a/core/java/android/content/pm/domain/verify/DomainVerificationManager.java
+++ b/core/java/android/content/pm/verify/domain/DomainVerificationManager.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.content.pm.domain.verify;
+package android.content.pm.verify.domain;
import android.annotation.IntDef;
import android.annotation.NonNull;
@@ -26,7 +26,6 @@
import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.UserHandle;
-import android.util.AndroidException;
import java.util.List;
import java.util.Set;
@@ -40,7 +39,7 @@
* {@link android.Manifest.permission#DOMAIN_VERIFICATION_AGENT}) to update the approval status
* of domains declared by applications in their AndroidManifest.xml, to allow them to open those
* links inside the app when selected by the user. This is done through querying
- * {@link #getDomainVerificationSet(String)} and calling
+ * {@link #getDomainVerificationInfo(String)} and calling
* {@link #setDomainVerificationStatus(UUID, Set, int)}.
*
* Also allows the domain preference settings (holder of
@@ -62,7 +61,7 @@
* {@link Intent#ACTION_DOMAINS_NEED_VERIFICATION}.
*/
String EXTRA_VERIFICATION_REQUEST =
- "android.content.pm.domain.verify.extra.VERIFICATION_REQUEST";
+ "android.content.pm.verify.domain.extra.VERIFICATION_REQUEST";
/**
* No response has been recorded by either the system or any verification agent.
@@ -169,67 +168,53 @@
}
/**
- * Used to iterate all {@link DomainVerificationSet} values to do cleanup or retries. This is
+ * Used to iterate all {@link DomainVerificationInfo} values to do cleanup or retries. This is
* usually a heavy workload and should be done infrequently.
*
* @return the current snapshot of package names with valid autoVerify URLs.
*/
@NonNull
- @RequiresPermission(allOf = {
- android.Manifest.permission.DOMAIN_VERIFICATION_AGENT,
- android.Manifest.permission.QUERY_ALL_PACKAGES
- })
+ @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT)
List<String> getValidVerificationPackageNames();
/**
- * Retrieves the domain verification state for a given package. The caller must be the domain
- * verification agent for the device with
- * {@link android.Manifest.permission#DOMAIN_VERIFICATION_AGENT}, or hold
- * {@link android.Manifest.permission#UPDATE_DOMAIN_VERIFICATION_USER_SELECTION}.
- * Also requires that the caller have the
- * {@link android.Manifest.permission#QUERY_ALL_PACKAGES} permission in addition to either of
- * the requirements above.
+ * Retrieves the domain verification state for a given package.
*
* @return the data for the package, or null if it does not declare any autoVerify domains
* @throws NameNotFoundException If the package is unavailable. This is an unrecoverable error
* and should not be re-tried except on a time scheduled basis.
*/
@Nullable
- @RequiresPermission(allOf = {
+ @RequiresPermission(anyOf = {
android.Manifest.permission.DOMAIN_VERIFICATION_AGENT,
- android.Manifest.permission.QUERY_ALL_PACKAGES,
android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION
- }, conditional = true)
- DomainVerificationSet getDomainVerificationSet(@NonNull String packageName)
+ })
+ DomainVerificationInfo getDomainVerificationInfo(@NonNull String packageName)
throws NameNotFoundException;
/**
* Change the verification status of the {@param domains} of the package associated with
* {@param domainSetId}.
*
- * @param domainSetId See {@link DomainVerificationSet#getIdentifier()}.
+ * @param domainSetId See {@link DomainVerificationInfo#getIdentifier()}.
* @param domains List of host names to change the state of.
- * @param state See {@link DomainVerificationSet#getHostToStateMap()}.
- * @throws InvalidDomainSetException If the ID is invalidated or the {@param domains} are
- * invalid. This usually means the work being processed by the
- * verification agent is outdated and a new request should
- * be scheduled, if one has not already been done as part of
- * the {@link Intent#ACTION_DOMAINS_NEED_VERIFICATION}
- * broadcast.
- * @throws NameNotFoundException If the ID is known to be good, but the package is
- * unavailable. This may be because the package is
- * installed on a volume that is no longer mounted. This
- * error is unrecoverable until the package is available
- * again, and should not be re-tried except on a time
- * scheduled basis.
+ * @param state See {@link DomainVerificationInfo#getHostToStateMap()}.
+ * @throws IllegalArgumentException If the ID is invalidated or the {@param domains} are
+ * invalid. This usually means the work being processed by the
+ * verification agent is outdated and a new request should
+ * be scheduled, if one has not already been done as part of
+ * the {@link Intent#ACTION_DOMAINS_NEED_VERIFICATION}
+ * broadcast.
+ * @throws NameNotFoundException If the ID is known to be good, but the package is
+ * unavailable. This may be because the package is
+ * installed on a volume that is no longer mounted. This
+ * error is unrecoverable until the package is available
+ * again, and should not be re-tried except on a time
+ * scheduled basis.
*/
- @RequiresPermission(allOf = {
- android.Manifest.permission.DOMAIN_VERIFICATION_AGENT,
- android.Manifest.permission.QUERY_ALL_PACKAGES
- })
+ @RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT)
void setDomainVerificationStatus(@NonNull UUID domainSetId, @NonNull Set<String> domains,
- @DomainVerificationState.State int state)
- throws InvalidDomainSetException, NameNotFoundException;
+ @DomainVerificationState.State int state) throws NameNotFoundException;
/**
* TODO(b/178525735): This documentation is incorrect in the context of UX changes.
@@ -256,22 +241,21 @@
* This will be combined with the verification status and other system state to determine which
* application is launched to handle an app link.
*
- * @param domainSetId See {@link DomainVerificationSet#getIdentifier()}.
+ * @param domainSetId See {@link DomainVerificationInfo#getIdentifier()}.
* @param domains The domains to toggle the state of.
* @param enabled Whether or not the app should automatically open the domains specified.
- * @throws InvalidDomainSetException If the ID is invalidated or the {@param domains} are
- * invalid.
- * @throws NameNotFoundException If the ID is known to be good, but the package is
- * unavailable. This may be because the package is
- * installed on a volume that is no longer mounted. This
- * error is unrecoverable until the package is available
- * again, and should not be re-tried except on a time
- * scheduled basis.
+ * @throws IllegalArgumentException If the ID is invalidated or the {@param domains} are
+ * invalid.
+ * @throws NameNotFoundException If the ID is known to be good, but the package is
+ * unavailable. This may be because the package is
+ * installed on a volume that is no longer mounted. This
+ * error is unrecoverable until the package is available
+ * again, and should not be re-tried except on a time
+ * scheduled basis.
*/
@RequiresPermission(android.Manifest.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION)
void setDomainVerificationUserSelection(@NonNull UUID domainSetId,
- @NonNull Set<String> domains, boolean enabled)
- throws InvalidDomainSetException, NameNotFoundException;
+ @NonNull Set<String> domains, boolean enabled) throws NameNotFoundException;
/**
* Retrieve the user selection data for the given {@param packageName} and the current user.
@@ -292,13 +276,15 @@
throws NameNotFoundException;
/**
- * Thrown if a {@link DomainVerificationSet#getIdentifier()}} or an associated set of domains
+ * Thrown if a {@link DomainVerificationInfo#getIdentifier()}} or an associated set of domains
* provided by the caller is no longer valid. This may be recoverable, and the caller should
* re-query the package name associated with the ID using
- * {@link #getDomainVerificationSet(String)} in order to check. If that also fails, then the
+ * {@link #getDomainVerificationInfo(String)} in order to check. If that also fails, then the
* package is no longer known to the device and thus all pending work for it should be dropped.
+ *
+ * @hide
*/
- class InvalidDomainSetException extends AndroidException {
+ class InvalidDomainSetException extends IllegalArgumentException {
public static final int REASON_ID_NULL = 1;
public static final int REASON_ID_INVALID = 2;
@@ -315,7 +301,7 @@
public @interface Reason {
}
- private static String buildMessage(@Nullable UUID domainSetId, @Nullable String packageName,
+ public static String buildMessage(@Nullable UUID domainSetId, @Nullable String packageName,
@Reason int reason) {
switch (reason) {
case REASON_ID_NULL:
diff --git a/core/java/android/content/pm/domain/verify/DomainVerificationManagerImpl.java b/core/java/android/content/pm/verify/domain/DomainVerificationManagerImpl.java
similarity index 92%
rename from core/java/android/content/pm/domain/verify/DomainVerificationManagerImpl.java
rename to core/java/android/content/pm/verify/domain/DomainVerificationManagerImpl.java
index 8ce0e9a..5938def 100644
--- a/core/java/android/content/pm/domain/verify/DomainVerificationManagerImpl.java
+++ b/core/java/android/content/pm/verify/domain/DomainVerificationManagerImpl.java
@@ -14,13 +14,14 @@
* limitations under the License.
*/
-package android.content.pm.domain.verify;
+package android.content.pm.verify.domain;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Context;
import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.verify.domain.IDomainVerificationManager;
import android.os.RemoteException;
import android.os.ServiceSpecificException;
@@ -67,10 +68,10 @@
@Nullable
@Override
- public DomainVerificationSet getDomainVerificationSet(@NonNull String packageName)
+ public DomainVerificationInfo getDomainVerificationInfo(@NonNull String packageName)
throws NameNotFoundException {
try {
- return mDomainVerificationManager.getDomainVerificationSet(packageName);
+ return mDomainVerificationManager.getDomainVerificationInfo(packageName);
} catch (Exception e) {
Exception converted = rethrow(e, packageName);
if (converted instanceof NameNotFoundException) {
@@ -85,7 +86,7 @@
@Override
public void setDomainVerificationStatus(@NonNull UUID domainSetId, @NonNull Set<String> domains,
- int state) throws InvalidDomainSetException, NameNotFoundException {
+ int state) throws IllegalArgumentException, NameNotFoundException {
try {
mDomainVerificationManager.setDomainVerificationStatus(domainSetId.toString(),
new ArrayList<>(domains), state);
@@ -122,7 +123,7 @@
@Override
public void setDomainVerificationUserSelection(@NonNull UUID domainSetId,
@NonNull Set<String> domains, boolean enabled)
- throws InvalidDomainSetException, NameNotFoundException {
+ throws IllegalArgumentException, NameNotFoundException {
try {
mDomainVerificationManager.setDomainVerificationUserSelection(domainSetId.toString(),
new ArrayList<>(domains), enabled, mContext.getUserId());
@@ -177,8 +178,8 @@
switch (managerErrorCode) {
case ERROR_INVALID_DOMAIN_SET:
int errorSpecificCode = packedErrorCode >> 16;
- return new InvalidDomainSetException(domainSetId, packageName,
- errorSpecificCode);
+ return new IllegalArgumentException(InvalidDomainSetException.buildMessage(
+ domainSetId, packageName, errorSpecificCode));
case ERROR_NAME_NOT_FOUND:
return new NameNotFoundException(packageName);
default:
diff --git a/core/java/android/content/pm/domain/verify/DomainVerificationRequest.java b/core/java/android/content/pm/verify/domain/DomainVerificationRequest.java
similarity index 92%
rename from core/java/android/content/pm/domain/verify/DomainVerificationRequest.java
rename to core/java/android/content/pm/verify/domain/DomainVerificationRequest.java
index 46930ab..473abce 100644
--- a/core/java/android/content/pm/domain/verify/DomainVerificationRequest.java
+++ b/core/java/android/content/pm/verify/domain/DomainVerificationRequest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.content.pm.domain.verify;
+package android.content.pm.verify.domain;
import android.annotation.NonNull;
import android.annotation.SystemApi;
@@ -32,7 +32,7 @@
* <p>
* This contains the set of packages which have been invalidated and will require
* re-verification. The exact domains can be retrieved with
- * {@link DomainVerificationManager#getDomainVerificationSet(String)}
+ * {@link DomainVerificationManager#getDomainVerificationInfo(String)}
*
* @hide
*/
@@ -43,7 +43,7 @@
/**
* The package names of the apps that need to be verified. The receiver should call
- * {@link DomainVerificationManager#getDomainVerificationSet(String)} with each of
+ * {@link DomainVerificationManager#getDomainVerificationInfo(String)} with each of
* these values to get the actual set of domains that need to be acted on.
*/
@NonNull
@@ -58,7 +58,7 @@
// CHECKSTYLE:OFF Generated code
//
// To regenerate run:
- // $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/content/pm/domain/verify/DomainVerificationRequest.java
+ // $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/content/pm/verify/domain/DomainVerificationRequest.java
//
// To exclude the generated code from IntelliJ auto-formatting enable (one-time):
// Settings > Editor > Code Style > Formatter Control
@@ -70,7 +70,7 @@
*
* @param packageNames
* The package names of the apps that need to be verified. The receiver should call
- * {@link DomainVerificationManager#getDomainVerificationSet(String)} with each of
+ * {@link DomainVerificationManager#getDomainVerificationInfo(String)} with each of
* these values to get the actual set of domains that need to be acted on.
* @hide
*/
@@ -86,7 +86,7 @@
/**
* The package names of the apps that need to be verified. The receiver should call
- * {@link DomainVerificationManager#getDomainVerificationSet(String)} with each of
+ * {@link DomainVerificationManager#getDomainVerificationInfo(String)} with each of
* these values to get the actual set of domains that need to be acted on.
*/
@DataClass.Generated.Member
@@ -176,9 +176,9 @@
};
@DataClass.Generated(
- time = 1611795646938L,
+ time = 1611862814990L,
codegenVersion = "1.0.22",
- sourceFile = "frameworks/base/core/java/android/content/pm/domain/verify/DomainVerificationRequest.java",
+ sourceFile = "frameworks/base/core/java/android/content/pm/verify/domain/DomainVerificationRequest.java",
inputSignatures = "private final @android.annotation.NonNull @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForStringSet.class) java.util.Set<java.lang.String> mPackageNames\nclass DomainVerificationRequest extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstructor=true, genAidl=false, genEqualsHashCode=true)")
@Deprecated
private void __metadata() {}
diff --git a/core/java/android/content/pm/domain/verify/DomainVerificationState.java b/core/java/android/content/pm/verify/domain/DomainVerificationState.java
similarity index 98%
rename from core/java/android/content/pm/domain/verify/DomainVerificationState.java
rename to core/java/android/content/pm/verify/domain/DomainVerificationState.java
index 6e257b2..17593ef 100644
--- a/core/java/android/content/pm/domain/verify/DomainVerificationState.java
+++ b/core/java/android/content/pm/verify/domain/DomainVerificationState.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.content.pm.domain.verify;
+package android.content.pm.verify.domain;
import android.annotation.IntDef;
diff --git a/core/java/android/content/pm/domain/verify/DomainVerificationUserSelection.aidl b/core/java/android/content/pm/verify/domain/DomainVerificationUserSelection.aidl
similarity index 93%
rename from core/java/android/content/pm/domain/verify/DomainVerificationUserSelection.aidl
rename to core/java/android/content/pm/verify/domain/DomainVerificationUserSelection.aidl
index edcdb76..ddb5ef8 100644
--- a/core/java/android/content/pm/domain/verify/DomainVerificationUserSelection.aidl
+++ b/core/java/android/content/pm/verify/domain/DomainVerificationUserSelection.aidl
@@ -14,6 +14,6 @@
* limitations under the License.
*/
-package android.content.pm.domain.verify;
+package android.content.pm.verify.domain;
parcelable DomainVerificationUserSelection;
diff --git a/core/java/android/content/pm/domain/verify/DomainVerificationUserSelection.java b/core/java/android/content/pm/verify/domain/DomainVerificationUserSelection.java
similarity index 98%
rename from core/java/android/content/pm/domain/verify/DomainVerificationUserSelection.java
rename to core/java/android/content/pm/verify/domain/DomainVerificationUserSelection.java
index 2e26ef3..8d16f75 100644
--- a/core/java/android/content/pm/domain/verify/DomainVerificationUserSelection.java
+++ b/core/java/android/content/pm/verify/domain/DomainVerificationUserSelection.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.content.pm.domain.verify;
+package android.content.pm.verify.domain;
import android.annotation.NonNull;
import android.annotation.SystemApi;
@@ -62,7 +62,7 @@
public final class DomainVerificationUserSelection implements Parcelable {
/**
- * @see DomainVerificationSet#getIdentifier
+ * @see DomainVerificationInfo#getIdentifier
*/
@NonNull
@DataClass.ParcelWith(Parcelling.BuiltIn.ForUUID.class)
@@ -155,7 +155,7 @@
}
/**
- * @see DomainVerificationSet#getIdentifier
+ * @see DomainVerificationInfo#getIdentifier
*/
@DataClass.Generated.Member
public @NonNull UUID getIdentifier() {
diff --git a/core/java/android/content/pm/domain/verify/IDomainVerificationManager.aidl b/core/java/android/content/pm/verify/domain/IDomainVerificationManager.aidl
similarity index 83%
rename from core/java/android/content/pm/domain/verify/IDomainVerificationManager.aidl
rename to core/java/android/content/pm/verify/domain/IDomainVerificationManager.aidl
index 3726480..21dd623b 100644
--- a/core/java/android/content/pm/domain/verify/IDomainVerificationManager.aidl
+++ b/core/java/android/content/pm/verify/domain/IDomainVerificationManager.aidl
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package android.content.pm.domain.verify;
+package android.content.pm.verify.domain;
-import android.content.pm.domain.verify.DomainVerificationSet;
-import android.content.pm.domain.verify.DomainVerificationUserSelection;
+import android.content.pm.verify.domain.DomainVerificationInfo;
+import android.content.pm.verify.domain.DomainVerificationUserSelection;
import java.util.List;
/**
@@ -29,7 +29,7 @@
List<String> getValidVerificationPackageNames();
@nullable
- DomainVerificationSet getDomainVerificationSet(String packageName);
+ DomainVerificationInfo getDomainVerificationInfo(String packageName);
@nullable
DomainVerificationUserSelection getDomainVerificationUserSelection(String packageName,
diff --git a/core/java/android/content/pm/domain/verify/TEST_MAPPING b/core/java/android/content/pm/verify/domain/TEST_MAPPING
similarity index 65%
rename from core/java/android/content/pm/domain/verify/TEST_MAPPING
rename to core/java/android/content/pm/verify/domain/TEST_MAPPING
index ffb1d9a..c6c9791 100644
--- a/core/java/android/content/pm/domain/verify/TEST_MAPPING
+++ b/core/java/android/content/pm/verify/domain/TEST_MAPPING
@@ -4,7 +4,7 @@
"name": "PackageManagerServiceUnitTests",
"options": [
{
- "include-filter": "com.android.server.pm.test.domain.verify"
+ "include-filter": "com.android.server.pm.test.verify.domain"
}
]
}
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index ed8b7bd..a702f5e 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -377,11 +377,11 @@
import com.android.server.pm.dex.DexoptOptions;
import com.android.server.pm.dex.PackageDexUsage;
import com.android.server.pm.dex.ViewCompiler;
-import com.android.server.pm.domain.verify.DomainVerificationManagerInternal;
-import com.android.server.pm.domain.verify.DomainVerificationService;
-import com.android.server.pm.domain.verify.proxy.DomainVerificationProxy;
-import com.android.server.pm.domain.verify.proxy.DomainVerificationProxyV1;
-import com.android.server.pm.domain.verify.proxy.DomainVerificationProxyV2;
+import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;
+import com.android.server.pm.verify.domain.DomainVerificationService;
+import com.android.server.pm.verify.domain.proxy.DomainVerificationProxy;
+import com.android.server.pm.verify.domain.proxy.DomainVerificationProxyV1;
+import com.android.server.pm.verify.domain.proxy.DomainVerificationProxyV2;
import com.android.server.pm.parsing.PackageCacher;
import com.android.server.pm.parsing.PackageInfoUtils;
import com.android.server.pm.parsing.PackageParser2;
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index b6b6fb6..b5765b5 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -104,7 +104,7 @@
import com.android.server.LocalServices;
import com.android.server.SystemConfig;
import com.android.server.pm.PackageManagerShellCommandDataLoader.Metadata;
-import com.android.server.pm.domain.verify.DomainVerificationShell;
+import com.android.server.pm.verify.domain.DomainVerificationShell;
import com.android.server.pm.permission.LegacyPermissionManagerInternal;
import dalvik.system.DexFile;
diff --git a/services/core/java/com/android/server/pm/PackageSettingBase.java b/services/core/java/com/android/server/pm/PackageSettingBase.java
index d300518..8aa553d 100644
--- a/services/core/java/com/android/server/pm/PackageSettingBase.java
+++ b/services/core/java/com/android/server/pm/PackageSettingBase.java
@@ -42,8 +42,8 @@
import android.util.proto.ProtoOutputStream;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.server.pm.domain.verify.DomainVerificationManagerInternal;
-import com.android.server.pm.domain.verify.DomainVerificationService;
+import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;
+import com.android.server.pm.verify.domain.DomainVerificationService;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import java.io.File;
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index 88144d4..fb033e6 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -105,9 +105,9 @@
import com.android.server.LocalServices;
import com.android.server.backup.PreferredActivityBackupHelper;
import com.android.server.pm.Installer.InstallerException;
-import com.android.server.pm.domain.verify.DomainVerificationLegacySettings;
-import com.android.server.pm.domain.verify.DomainVerificationManagerInternal;
-import com.android.server.pm.domain.verify.DomainVerificationPersistence;
+import com.android.server.pm.verify.domain.DomainVerificationLegacySettings;
+import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;
+import com.android.server.pm.verify.domain.DomainVerificationPersistence;
import com.android.server.pm.parsing.PackageInfoUtils;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import com.android.server.pm.parsing.pkg.AndroidPackageUtils;
diff --git a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationCollector.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationCollector.java
similarity index 99%
rename from services/core/java/com/android/server/pm/domain/verify/DomainVerificationCollector.java
rename to services/core/java/com/android/server/pm/verify/domain/DomainVerificationCollector.java
index 832714f..36efb39 100644
--- a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationCollector.java
+++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationCollector.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify;
+package com.android.server.pm.verify.domain;
import android.annotation.NonNull;
import android.compat.annotation.ChangeId;
diff --git a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationDebug.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationDebug.java
similarity index 95%
rename from services/core/java/com/android/server/pm/domain/verify/DomainVerificationDebug.java
rename to services/core/java/com/android/server/pm/verify/domain/DomainVerificationDebug.java
index 9bf65b4..af9978b 100644
--- a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationDebug.java
+++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationDebug.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify;
+package com.android.server.pm.verify.domain;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.Signature;
-import android.content.pm.domain.verify.DomainVerificationManager;
-import android.content.pm.domain.verify.DomainVerificationState;
+import android.content.pm.verify.domain.DomainVerificationManager;
+import android.content.pm.verify.domain.DomainVerificationState;
import android.os.UserHandle;
import android.util.ArrayMap;
import android.util.ArraySet;
@@ -32,9 +32,9 @@
import com.android.internal.util.CollectionUtils;
import com.android.server.pm.PackageSetting;
-import com.android.server.pm.domain.verify.models.DomainVerificationPkgState;
-import com.android.server.pm.domain.verify.models.DomainVerificationStateMap;
-import com.android.server.pm.domain.verify.models.DomainVerificationUserState;
+import com.android.server.pm.verify.domain.models.DomainVerificationPkgState;
+import com.android.server.pm.verify.domain.models.DomainVerificationStateMap;
+import com.android.server.pm.verify.domain.models.DomainVerificationUserState;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import java.util.Arrays;
diff --git a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationEnforcer.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationEnforcer.java
similarity index 97%
rename from services/core/java/com/android/server/pm/domain/verify/DomainVerificationEnforcer.java
rename to services/core/java/com/android/server/pm/verify/domain/DomainVerificationEnforcer.java
index cdcc5fc..c521f82 100644
--- a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationEnforcer.java
+++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationEnforcer.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify;
+package com.android.server.pm.verify.domain;
import android.Manifest;
import android.annotation.NonNull;
@@ -23,7 +23,7 @@
import android.os.Binder;
import android.os.Process;
-import com.android.server.pm.domain.verify.proxy.DomainVerificationProxy;
+import com.android.server.pm.verify.domain.proxy.DomainVerificationProxy;
public class DomainVerificationEnforcer {
diff --git a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationLegacySettings.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationLegacySettings.java
similarity index 99%
rename from services/core/java/com/android/server/pm/domain/verify/DomainVerificationLegacySettings.java
rename to services/core/java/com/android/server/pm/verify/domain/DomainVerificationLegacySettings.java
index 09307d2..c787356 100644
--- a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationLegacySettings.java
+++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationLegacySettings.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify;
+package com.android.server.pm.verify.domain;
import android.annotation.NonNull;
import android.annotation.Nullable;
diff --git a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationManagerInternal.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerInternal.java
similarity index 93%
rename from services/core/java/com/android/server/pm/domain/verify/DomainVerificationManagerInternal.java
rename to services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerInternal.java
index d8e5f72..7ad275a 100644
--- a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationManagerInternal.java
+++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerInternal.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify;
+package com.android.server.pm.verify.domain;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -23,25 +23,22 @@
import android.content.Intent;
import android.content.pm.IntentFilterVerificationInfo;
import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.domain.verify.DomainVerificationManager;
-import android.content.pm.domain.verify.DomainVerificationSet;
+import android.content.pm.verify.domain.DomainVerificationInfo;
+import android.content.pm.verify.domain.DomainVerificationManager;
import android.os.Binder;
import android.os.UserHandle;
import android.util.IndentingPrintWriter;
import android.util.TypedXmlPullParser;
import android.util.TypedXmlSerializer;
-import com.android.internal.annotations.GuardedBy;
-import com.android.server.pm.PackageManagerService;
import com.android.server.pm.PackageSetting;
-import com.android.server.pm.domain.verify.models.DomainVerificationPkgState;
-import com.android.server.pm.domain.verify.proxy.DomainVerificationProxy;
+import com.android.server.pm.verify.domain.models.DomainVerificationPkgState;
+import com.android.server.pm.verify.domain.proxy.DomainVerificationProxy;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
-import java.util.List;
import java.util.Set;
import java.util.UUID;
@@ -154,7 +151,7 @@
* tag has already been entered.
* <p>
* This is <b>only</b> for restore, and will override package states, ignoring if their {@link
- * DomainVerificationSet#getIdentifier()}s match. It's expected that any restored domains marked
+ * DomainVerificationInfo#getIdentifier()}s match. It's expected that any restored domains marked
* as success verify against the server correctly, although the verification agent may decide to
* re-verify them when it gets the chance.
*/
@@ -220,12 +217,12 @@
* unavailable
*/
@Nullable
- UUID getDomainVerificationSetId(@NonNull String packageName);
+ UUID getDomainVerificationInfoId(@NonNull String packageName);
@RequiresPermission(android.Manifest.permission.DOMAIN_VERIFICATION_AGENT)
void setDomainVerificationStatusInternal(int callingUid, @NonNull UUID domainSetId,
@NonNull Set<String> domains, int state)
- throws InvalidDomainSetException, NameNotFoundException;
+ throws IllegalArgumentException, NameNotFoundException;
interface Connection {
diff --git a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationManagerStub.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerStub.java
similarity index 88%
rename from services/core/java/com/android/server/pm/domain/verify/DomainVerificationManagerStub.java
rename to services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerStub.java
index 6147cde..8aa6337 100644
--- a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationManagerStub.java
+++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationManagerStub.java
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify;
+package com.android.server.pm.verify.domain;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.domain.verify.DomainVerificationManager.InvalidDomainSetException;
-import android.content.pm.domain.verify.DomainVerificationManagerImpl;
-import android.content.pm.domain.verify.DomainVerificationSet;
-import android.content.pm.domain.verify.DomainVerificationUserSelection;
-import android.content.pm.domain.verify.IDomainVerificationManager;
+import android.content.pm.verify.domain.DomainVerificationManager.InvalidDomainSetException;
+import android.content.pm.verify.domain.DomainVerificationManagerImpl;
+import android.content.pm.verify.domain.DomainVerificationInfo;
+import android.content.pm.verify.domain.DomainVerificationUserSelection;
+import android.content.pm.verify.domain.IDomainVerificationManager;
import android.os.ServiceSpecificException;
import android.util.ArraySet;
@@ -52,9 +52,9 @@
@Nullable
@Override
- public DomainVerificationSet getDomainVerificationSet(String packageName) {
+ public DomainVerificationInfo getDomainVerificationInfo(String packageName) {
try {
- return mService.getDomainVerificationSet(packageName);
+ return mService.getDomainVerificationInfo(packageName);
} catch (Exception e) {
throw rethrow(e);
}
diff --git a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationMessageCodes.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationMessageCodes.java
similarity index 92%
rename from services/core/java/com/android/server/pm/domain/verify/DomainVerificationMessageCodes.java
rename to services/core/java/com/android/server/pm/verify/domain/DomainVerificationMessageCodes.java
index 7fb0067..7af78c6 100644
--- a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationMessageCodes.java
+++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationMessageCodes.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify;
+package com.android.server.pm.verify.domain;
import android.os.Handler;
import com.android.server.pm.PackageManagerService;
-import com.android.server.pm.domain.verify.proxy.DomainVerificationProxy;
+import com.android.server.pm.verify.domain.proxy.DomainVerificationProxy;
/**
* Codes that are sent through the {@link PackageManagerService} {@link Handler} and eventually
diff --git a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationPersistence.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationPersistence.java
similarity index 97%
rename from services/core/java/com/android/server/pm/domain/verify/DomainVerificationPersistence.java
rename to services/core/java/com/android/server/pm/verify/domain/DomainVerificationPersistence.java
index 04adb00..679f948 100644
--- a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationPersistence.java
+++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationPersistence.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify;
+package com.android.server.pm.verify.domain;
import android.annotation.NonNull;
import android.annotation.Nullable;
-import android.content.pm.domain.verify.DomainVerificationState;
+import android.content.pm.verify.domain.DomainVerificationState;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.ArraySet;
@@ -27,9 +27,9 @@
import android.util.TypedXmlSerializer;
import com.android.server.pm.SettingsXml;
-import com.android.server.pm.domain.verify.models.DomainVerificationPkgState;
-import com.android.server.pm.domain.verify.models.DomainVerificationStateMap;
-import com.android.server.pm.domain.verify.models.DomainVerificationUserState;
+import com.android.server.pm.verify.domain.models.DomainVerificationPkgState;
+import com.android.server.pm.verify.domain.models.DomainVerificationStateMap;
+import com.android.server.pm.verify.domain.models.DomainVerificationUserState;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationService.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java
similarity index 97%
rename from services/core/java/com/android/server/pm/domain/verify/DomainVerificationService.java
rename to services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java
index d316773..4fd01d9 100644
--- a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationService.java
+++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify;
+package com.android.server.pm.verify.domain;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -26,18 +26,15 @@
import android.content.pm.IntentFilterVerificationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.PackageUserState;
-import android.content.pm.domain.verify.DomainVerificationManager;
-import android.content.pm.domain.verify.DomainVerificationSet;
-import android.content.pm.domain.verify.DomainVerificationState;
-import android.content.pm.domain.verify.DomainVerificationUserSelection;
-import android.content.pm.domain.verify.IDomainVerificationManager;
-import android.os.Binder;
+import android.content.pm.verify.domain.DomainVerificationInfo;
+import android.content.pm.verify.domain.DomainVerificationManager;
+import android.content.pm.verify.domain.DomainVerificationState;
+import android.content.pm.verify.domain.DomainVerificationUserSelection;
+import android.content.pm.verify.domain.IDomainVerificationManager;
import android.os.UserHandle;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.IndentingPrintWriter;
-import android.util.Singleton;
import android.util.Slog;
import android.util.SparseArray;
import android.util.SparseIntArray;
@@ -49,13 +46,12 @@
import com.android.server.SystemConfig;
import com.android.server.SystemService;
import com.android.server.compat.PlatformCompat;
-import com.android.server.pm.PackageManagerService;
import com.android.server.pm.PackageSetting;
-import com.android.server.pm.domain.verify.models.DomainVerificationPkgState;
-import com.android.server.pm.domain.verify.models.DomainVerificationStateMap;
-import com.android.server.pm.domain.verify.models.DomainVerificationUserState;
-import com.android.server.pm.domain.verify.proxy.DomainVerificationProxy;
-import com.android.server.pm.domain.verify.proxy.DomainVerificationProxyUnavailable;
+import com.android.server.pm.verify.domain.models.DomainVerificationPkgState;
+import com.android.server.pm.verify.domain.models.DomainVerificationStateMap;
+import com.android.server.pm.verify.domain.models.DomainVerificationUserState;
+import com.android.server.pm.verify.domain.proxy.DomainVerificationProxy;
+import com.android.server.pm.verify.domain.proxy.DomainVerificationProxyUnavailable;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import org.xmlpull.v1.XmlPullParserException;
@@ -205,7 +201,7 @@
@Nullable
@Override
- public UUID getDomainVerificationSetId(@NonNull String packageName) {
+ public UUID getDomainVerificationInfoId(@NonNull String packageName) {
synchronized (mLock) {
DomainVerificationPkgState pkgState = mAttachedPkgStates.get(packageName);
if (pkgState != null) {
@@ -218,7 +214,7 @@
@Nullable
@Override
- public DomainVerificationSet getDomainVerificationSet(@NonNull String packageName)
+ public DomainVerificationInfo getDomainVerificationInfo(@NonNull String packageName)
throws NameNotFoundException {
mEnforcer.assertApprovedQuerent(mConnection.getCallingUid(), mProxy);
synchronized (mLock) {
@@ -247,7 +243,7 @@
}
// TODO(b/159952358): Do not return if no values are editable (all ignored states)?
- return new DomainVerificationSet(pkgState.getId(), packageName, hostToStateMap);
+ return new DomainVerificationInfo(pkgState.getId(), packageName, hostToStateMap);
}
}
diff --git a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationSettings.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationSettings.java
similarity index 97%
rename from services/core/java/com/android/server/pm/domain/verify/DomainVerificationSettings.java
rename to services/core/java/com/android/server/pm/verify/domain/DomainVerificationSettings.java
index 185fd62..073967e 100644
--- a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationSettings.java
+++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationSettings.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify;
+package com.android.server.pm.verify.domain;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
-import android.content.pm.domain.verify.DomainVerificationState;
+import android.content.pm.verify.domain.DomainVerificationState;
import android.os.UserHandle;
import android.util.ArrayMap;
import android.util.ArraySet;
@@ -30,9 +30,9 @@
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.server.pm.domain.verify.models.DomainVerificationPkgState;
-import com.android.server.pm.domain.verify.models.DomainVerificationStateMap;
-import com.android.server.pm.domain.verify.models.DomainVerificationUserState;
+import com.android.server.pm.verify.domain.models.DomainVerificationPkgState;
+import com.android.server.pm.verify.domain.models.DomainVerificationStateMap;
+import com.android.server.pm.verify.domain.models.DomainVerificationUserState;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationShell.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationShell.java
similarity index 98%
rename from services/core/java/com/android/server/pm/domain/verify/DomainVerificationShell.java
rename to services/core/java/com/android/server/pm/verify/domain/DomainVerificationShell.java
index c3efc67..7f9e75a 100644
--- a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationShell.java
+++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationShell.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify;
+package com.android.server.pm.verify.domain;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -22,9 +22,9 @@
import android.app.ActivityManager;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.domain.verify.DomainVerificationManager;
-import android.content.pm.domain.verify.DomainVerificationState;
-import android.content.pm.domain.verify.DomainVerificationUserSelection;
+import android.content.pm.verify.domain.DomainVerificationManager;
+import android.content.pm.verify.domain.DomainVerificationState;
+import android.content.pm.verify.domain.DomainVerificationUserSelection;
import android.os.Binder;
import android.os.UserHandle;
import android.text.TextUtils;
diff --git a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationUtils.java b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationUtils.java
similarity index 98%
rename from services/core/java/com/android/server/pm/domain/verify/DomainVerificationUtils.java
rename to services/core/java/com/android/server/pm/verify/domain/DomainVerificationUtils.java
index f704478..474f822 100644
--- a/services/core/java/com/android/server/pm/domain/verify/DomainVerificationUtils.java
+++ b/services/core/java/com/android/server/pm/verify/domain/DomainVerificationUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify;
+package com.android.server.pm.verify.domain;
import android.annotation.CheckResult;
import android.annotation.NonNull;
diff --git a/core/java/android/content/pm/domain/verify/TEST_MAPPING b/services/core/java/com/android/server/pm/verify/domain/TEST_MAPPING
similarity index 64%
copy from core/java/android/content/pm/domain/verify/TEST_MAPPING
copy to services/core/java/com/android/server/pm/verify/domain/TEST_MAPPING
index ffb1d9a..c6c9791 100644
--- a/core/java/android/content/pm/domain/verify/TEST_MAPPING
+++ b/services/core/java/com/android/server/pm/verify/domain/TEST_MAPPING
@@ -4,7 +4,7 @@
"name": "PackageManagerServiceUnitTests",
"options": [
{
- "include-filter": "com.android.server.pm.test.domain.verify"
+ "include-filter": "com.android.server.pm.test.verify.domain"
}
]
}
diff --git a/services/core/java/com/android/server/pm/domain/verify/models/DomainVerificationPkgState.java b/services/core/java/com/android/server/pm/verify/domain/models/DomainVerificationPkgState.java
similarity index 95%
rename from services/core/java/com/android/server/pm/domain/verify/models/DomainVerificationPkgState.java
rename to services/core/java/com/android/server/pm/verify/domain/models/DomainVerificationPkgState.java
index 1dc5549..48099aa 100644
--- a/services/core/java/com/android/server/pm/domain/verify/models/DomainVerificationPkgState.java
+++ b/services/core/java/com/android/server/pm/verify/domain/models/DomainVerificationPkgState.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify.models;
+package com.android.server.pm.verify.domain.models;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
-import android.content.pm.domain.verify.DomainVerificationManager;
-import android.content.pm.domain.verify.DomainVerificationState;
+import android.content.pm.verify.domain.DomainVerificationManager;
+import android.content.pm.verify.domain.DomainVerificationState;
import android.util.ArrayMap;
import android.util.SparseArray;
@@ -240,7 +240,7 @@
time = 1608234185474L,
codegenVersion = "1.0.22",
sourceFile = "frameworks/base/services/core/java/com/android/server/pm/domain/verify/models/DomainVerificationPkgState.java",
- inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate @android.annotation.NonNull java.util.UUID mId\nprivate final boolean mHasAutoVerifyDomains\nprivate final @android.annotation.NonNull android.util.ArrayMap<java.lang.String,java.lang.Integer> mStateMap\nprivate final @android.annotation.NonNull android.util.SparseArray<com.android.server.pm.domain.verify.models.DomainVerificationUserState> mUserSelectionStates\npublic @android.annotation.Nullable com.android.server.pm.domain.verify.models.DomainVerificationUserState getUserSelectionState(int)\npublic @android.annotation.Nullable com.android.server.pm.domain.verify.models.DomainVerificationUserState getOrCreateUserSelectionState(int)\npublic void setId(java.util.UUID)\npublic void removeUser(int)\npublic void removeAllUsers()\nprivate int userSelectionStatesHashCode()\nprivate boolean userSelectionStatesEquals(android.util.SparseArray<com.android.server.pm.domain.verify.models.DomainVerificationUserState>)\nclass DomainVerificationPkgState extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genToString=true, genEqualsHashCode=true)")
+ inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate @android.annotation.NonNull java.util.UUID mId\nprivate final boolean mHasAutoVerifyDomains\nprivate final @android.annotation.NonNull android.util.ArrayMap<java.lang.String,java.lang.Integer> mStateMap\nprivate final @android.annotation.NonNull android.util.SparseArray<com.android.server.pm.verify.domain.models.DomainVerificationUserState> mUserSelectionStates\npublic @android.annotation.Nullable com.android.server.pm.verify.domain.models.DomainVerificationUserState getUserSelectionState(int)\npublic @android.annotation.Nullable com.android.server.pm.verify.domain.models.DomainVerificationUserState getOrCreateUserSelectionState(int)\npublic void setId(java.util.UUID)\npublic void removeUser(int)\npublic void removeAllUsers()\nprivate int userSelectionStatesHashCode()\nprivate boolean userSelectionStatesEquals(android.util.SparseArray<com.android.server.pm.verify.domain.models.DomainVerificationUserState>)\nclass DomainVerificationPkgState extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genToString=true, genEqualsHashCode=true)")
@Deprecated
private void __metadata() {}
diff --git a/services/core/java/com/android/server/pm/domain/verify/models/DomainVerificationStateMap.java b/services/core/java/com/android/server/pm/verify/domain/models/DomainVerificationStateMap.java
similarity index 98%
rename from services/core/java/com/android/server/pm/domain/verify/models/DomainVerificationStateMap.java
rename to services/core/java/com/android/server/pm/verify/domain/models/DomainVerificationStateMap.java
index ece1ce82..88ccd83 100644
--- a/services/core/java/com/android/server/pm/domain/verify/models/DomainVerificationStateMap.java
+++ b/services/core/java/com/android/server/pm/verify/domain/models/DomainVerificationStateMap.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify.models;
+package com.android.server.pm.verify.domain.models;
import android.annotation.IntRange;
import android.annotation.NonNull;
diff --git a/services/core/java/com/android/server/pm/domain/verify/models/DomainVerificationUserState.java b/services/core/java/com/android/server/pm/verify/domain/models/DomainVerificationUserState.java
similarity index 93%
rename from services/core/java/com/android/server/pm/domain/verify/models/DomainVerificationUserState.java
rename to services/core/java/com/android/server/pm/verify/domain/models/DomainVerificationUserState.java
index 4359540..8e82608 100644
--- a/services/core/java/com/android/server/pm/domain/verify/models/DomainVerificationUserState.java
+++ b/services/core/java/com/android/server/pm/verify/domain/models/DomainVerificationUserState.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify.models;
+package com.android.server.pm.verify.domain.models;
import android.annotation.NonNull;
import android.annotation.UserIdInt;
@@ -174,7 +174,7 @@
time = 1608234273324L,
codegenVersion = "1.0.22",
sourceFile = "frameworks/base/services/core/java/com/android/server/pm/domain/verify/models/DomainVerificationUserState.java",
- inputSignatures = "private final @android.annotation.UserIdInt int mUserId\nprivate final @android.annotation.NonNull android.util.ArraySet<java.lang.String> mEnabledHosts\nprivate boolean mDisallowLinkHandling\npublic com.android.server.pm.domain.verify.models.DomainVerificationUserState addHosts(android.util.ArraySet<java.lang.String>)\npublic com.android.server.pm.domain.verify.models.DomainVerificationUserState addHosts(java.util.Set<java.lang.String>)\npublic com.android.server.pm.domain.verify.models.DomainVerificationUserState removeHosts(android.util.ArraySet<java.lang.String>)\npublic com.android.server.pm.domain.verify.models.DomainVerificationUserState removeHosts(java.util.Set<java.lang.String>)\nclass DomainVerificationUserState extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genSetters=true, genEqualsHashCode=true, genToString=true)")
+ inputSignatures = "private final @android.annotation.UserIdInt int mUserId\nprivate final @android.annotation.NonNull android.util.ArraySet<java.lang.String> mEnabledHosts\nprivate boolean mDisallowLinkHandling\npublic com.android.server.pm.verify.domain.models.DomainVerificationUserState addHosts(android.util.ArraySet<java.lang.String>)\npublic com.android.server.pm.verify.domain.models.DomainVerificationUserState addHosts(java.util.Set<java.lang.String>)\npublic com.android.server.pm.verify.domain.models.DomainVerificationUserState removeHosts(android.util.ArraySet<java.lang.String>)\npublic com.android.server.pm.verify.domain.models.DomainVerificationUserState removeHosts(java.util.Set<java.lang.String>)\nclass DomainVerificationUserState extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genSetters=true, genEqualsHashCode=true, genToString=true)")
@Deprecated
private void __metadata() {}
diff --git a/services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxy.java b/services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxy.java
similarity index 94%
rename from services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxy.java
rename to services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxy.java
index c641caa..715d8fb 100644
--- a/services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxy.java
+++ b/services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxy.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify.proxy;
+package com.android.server.pm.verify.domain.proxy;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -23,9 +23,9 @@
import android.util.Slog;
import com.android.server.DeviceIdleInternal;
-import com.android.server.pm.domain.verify.DomainVerificationMessageCodes;
-import com.android.server.pm.domain.verify.DomainVerificationCollector;
-import com.android.server.pm.domain.verify.DomainVerificationManagerInternal;
+import com.android.server.pm.verify.domain.DomainVerificationMessageCodes;
+import com.android.server.pm.verify.domain.DomainVerificationCollector;
+import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;
import java.util.Objects;
import java.util.Set;
diff --git a/services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxyCombined.java b/services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyCombined.java
similarity index 96%
rename from services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxyCombined.java
rename to services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyCombined.java
index eb63d52..8571c08 100644
--- a/services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxyCombined.java
+++ b/services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyCombined.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify.proxy;
+package com.android.server.pm.verify.domain.proxy;
import android.annotation.NonNull;
diff --git a/services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxyUnavailable.java b/services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyUnavailable.java
similarity index 93%
rename from services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxyUnavailable.java
rename to services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyUnavailable.java
index f376f48..bd77983 100644
--- a/services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxyUnavailable.java
+++ b/services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyUnavailable.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify.proxy;
+package com.android.server.pm.verify.domain.proxy;
/** Stub implementation for when the verification agent is unavailable */
public class DomainVerificationProxyUnavailable implements DomainVerificationProxy {
diff --git a/services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxyV1.java b/services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyV1.java
similarity index 94%
rename from services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxyV1.java
rename to services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyV1.java
index 0d41f75..eab89e98 100644
--- a/services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxyV1.java
+++ b/services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyV1.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify.proxy;
+package com.android.server.pm.verify.domain.proxy;
import android.Manifest;
import android.annotation.NonNull;
@@ -25,9 +25,9 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
-import android.content.pm.domain.verify.DomainVerificationManager;
-import android.content.pm.domain.verify.DomainVerificationSet;
-import android.content.pm.domain.verify.DomainVerificationState;
+import android.content.pm.verify.domain.DomainVerificationInfo;
+import android.content.pm.verify.domain.DomainVerificationManager;
+import android.content.pm.verify.domain.DomainVerificationState;
import android.os.Process;
import android.os.UserHandle;
import android.text.TextUtils;
@@ -37,9 +37,9 @@
import android.util.Slog;
import com.android.internal.annotations.GuardedBy;
-import com.android.server.pm.domain.verify.DomainVerificationCollector;
-import com.android.server.pm.domain.verify.DomainVerificationManagerInternal;
-import com.android.server.pm.domain.verify.DomainVerificationMessageCodes;
+import com.android.server.pm.verify.domain.DomainVerificationCollector;
+import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;
+import com.android.server.pm.verify.domain.DomainVerificationMessageCodes;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import java.util.Collections;
@@ -129,7 +129,7 @@
packageNames.size());
synchronized (mLock) {
for (String packageName : packageNames) {
- UUID domainSetId = mManager.getDomainVerificationSetId(packageName);
+ UUID domainSetId = mManager.getDomainVerificationInfoId(packageName);
if (domainSetId == null) {
continue;
}
@@ -152,9 +152,9 @@
UUID domainSetId = pair.first;
String packageName = pair.second;
- DomainVerificationSet set;
+ DomainVerificationInfo set;
try {
- set = mManager.getDomainVerificationSet(packageName);
+ set = mManager.getDomainVerificationInfo(packageName);
} catch (PackageManager.NameNotFoundException ignored) {
return true;
}
diff --git a/services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxyV2.java b/services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyV2.java
similarity index 91%
rename from services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxyV2.java
rename to services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyV2.java
index 1595374..9fcbce2 100644
--- a/services/core/java/com/android/server/pm/domain/verify/proxy/DomainVerificationProxyV2.java
+++ b/services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyV2.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.domain.verify.proxy;
+package com.android.server.pm.verify.domain.proxy;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -22,13 +22,13 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
-import android.content.pm.domain.verify.DomainVerificationManager;
-import android.content.pm.domain.verify.DomainVerificationRequest;
+import android.content.pm.verify.domain.DomainVerificationManager;
+import android.content.pm.verify.domain.DomainVerificationRequest;
import android.os.Process;
import android.os.UserHandle;
import android.util.Slog;
-import com.android.server.pm.domain.verify.DomainVerificationMessageCodes;
+import com.android.server.pm.verify.domain.DomainVerificationMessageCodes;
import java.util.Set;
@@ -56,7 +56,7 @@
@Override
public void sendBroadcastForPackages(@NonNull Set<String> packageNames) {
- mConnection.schedule(com.android.server.pm.domain.verify.DomainVerificationMessageCodes.SEND_REQUEST, packageNames);
+ mConnection.schedule(com.android.server.pm.verify.domain.DomainVerificationMessageCodes.SEND_REQUEST, packageNames);
}
@Override
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 7b117d7..50cb00f 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -160,7 +160,7 @@
import com.android.server.pm.ShortcutService;
import com.android.server.pm.UserManagerService;
import com.android.server.pm.dex.SystemServerDexLoadReporter;
-import com.android.server.pm.domain.verify.DomainVerificationService;
+import com.android.server.pm.verify.domain.DomainVerificationService;
import com.android.server.policy.PermissionPolicyService;
import com.android.server.policy.PhoneWindowManager;
import com.android.server.policy.role.RoleServicePlatformHelperImpl;
diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationCollectorTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationCollectorTest.kt
similarity index 98%
rename from services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationCollectorTest.kt
rename to services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationCollectorTest.kt
index 414a5e4..e99b071 100644
--- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationCollectorTest.kt
+++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationCollectorTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.server.pm.test.domain.verify
+package com.android.server.pm.test.verify.domain
import android.content.Intent
import android.content.pm.ApplicationInfo
@@ -25,7 +25,7 @@
import android.util.ArraySet
import com.android.server.SystemConfig
import com.android.server.compat.PlatformCompat
-import com.android.server.pm.domain.verify.DomainVerificationCollector
+import com.android.server.pm.verify.domain.DomainVerificationCollector
import com.android.server.pm.parsing.pkg.AndroidPackage
import com.android.server.testutils.mockThrowOnUnmocked
import com.android.server.testutils.whenever
diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationCoreApiTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationCoreApiTest.kt
similarity index 91%
rename from services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationCoreApiTest.kt
rename to services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationCoreApiTest.kt
index 2ff7baf..deb3147 100644
--- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationCoreApiTest.kt
+++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationCoreApiTest.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.android.server.pm.test.domain.verify
+package com.android.server.pm.test.verify.domain
-import android.content.pm.domain.verify.DomainVerificationRequest
-import android.content.pm.domain.verify.DomainVerificationSet
-import android.content.pm.domain.verify.DomainVerificationUserSelection
+import android.content.pm.verify.domain.DomainVerificationRequest
+import android.content.pm.verify.domain.DomainVerificationInfo
+import android.content.pm.verify.domain.DomainVerificationUserSelection
import android.os.Parcel
import android.os.Parcelable
import android.os.UserHandle
@@ -62,7 +62,7 @@
),
Parameter(
initial = {
- DomainVerificationSet(
+ DomainVerificationInfo(
UUID.fromString("703f6d34-6241-4cfd-8176-2e1d23355811"),
"com.test.pkg",
mapOf(
@@ -72,15 +72,15 @@
)
)
},
- unparcel = { DomainVerificationSet.CREATOR.createFromParcel(it) },
+ unparcel = { DomainVerificationInfo.CREATOR.createFromParcel(it) },
assertion = { first, second ->
- assertAll<DomainVerificationSet, UUID>(first, second,
+ assertAll<DomainVerificationInfo, UUID>(first, second,
{ it.identifier }, { it.component1() }, IS_EQUAL_TO
)
- assertAll<DomainVerificationSet, String>(first, second,
+ assertAll<DomainVerificationInfo, String>(first, second,
{ it.packageName }, { it.component2() }, IS_EQUAL_TO
)
- assertAll<DomainVerificationSet, Map<String, Int?>>(first, second,
+ assertAll<DomainVerificationInfo, Map<String, Int?>>(first, second,
{ it.hostToStateMap }, { it.component3() }, IS_MAP_EQUAL_TO
)
}
diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationEnforcerTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt
similarity index 97%
rename from services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationEnforcerTest.kt
rename to services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt
index 8b6e085..d863194 100644
--- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationEnforcerTest.kt
+++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationEnforcerTest.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package com.android.server.pm.test.domain.verify
+package com.android.server.pm.test.verify.domain
import android.content.Context
import android.content.Intent
import android.content.pm.PackageUserState
-import android.content.pm.domain.verify.DomainVerificationManager
+import android.content.pm.verify.domain.DomainVerificationManager
import android.content.pm.parsing.component.ParsedActivity
import android.content.pm.parsing.component.ParsedIntentInfo
import android.os.Build
@@ -29,10 +29,10 @@
import android.util.SparseArray
import androidx.test.platform.app.InstrumentationRegistry
import com.android.server.pm.PackageSetting
-import com.android.server.pm.domain.verify.DomainVerificationEnforcer
-import com.android.server.pm.domain.verify.DomainVerificationManagerInternal
-import com.android.server.pm.domain.verify.DomainVerificationService
-import com.android.server.pm.domain.verify.proxy.DomainVerificationProxy
+import com.android.server.pm.verify.domain.DomainVerificationEnforcer
+import com.android.server.pm.verify.domain.DomainVerificationManagerInternal
+import com.android.server.pm.verify.domain.DomainVerificationService
+import com.android.server.pm.verify.domain.proxy.DomainVerificationProxy
import com.android.server.pm.parsing.pkg.AndroidPackage
import com.android.server.testutils.mockThrowOnUnmocked
import com.android.server.testutils.spyThrowOnUnmocked
@@ -230,8 +230,8 @@
service(Type.VERIFIER, "getPackageNames") { _, _, _ ->
validVerificationPackageNames
},
- service(Type.QUERENT, "getSet") { _, _, _ ->
- getDomainVerificationSet(TEST_PKG)
+ service(Type.QUERENT, "getInfo") { _, _, _ ->
+ getDomainVerificationInfo(TEST_PKG)
},
service(Type.VERIFIER, "setStatus") { _, _, _ ->
setDomainVerificationStatus(
diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationLegacySettingsTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationLegacySettingsTest.kt
similarity index 93%
rename from services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationLegacySettingsTest.kt
rename to services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationLegacySettingsTest.kt
index 47601a4..9a3bd99 100644
--- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationLegacySettingsTest.kt
+++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationLegacySettingsTest.kt
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.server.pm.test.domain.verify
+package com.android.server.pm.test.verify.domain
import android.content.pm.IntentFilterVerificationInfo
import android.content.pm.PackageManager
import android.util.ArraySet
-import com.android.server.pm.domain.verify.DomainVerificationLegacySettings
-import com.android.server.pm.test.domain.verify.DomainVerificationPersistenceTest.Companion.readXml
-import com.android.server.pm.test.domain.verify.DomainVerificationPersistenceTest.Companion.writeXml
+import com.android.server.pm.verify.domain.DomainVerificationLegacySettings
+import com.android.server.pm.test.verify.domain.DomainVerificationPersistenceTest.Companion.readXml
+import com.android.server.pm.test.verify.domain.DomainVerificationPersistenceTest.Companion.writeXml
import com.google.common.truth.Truth.assertWithMessage
import org.junit.Rule
import org.junit.Test
diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationModelExtensions.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationModelExtensions.kt
similarity index 73%
rename from services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationModelExtensions.kt
rename to services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationModelExtensions.kt
index 41344c9..a76d8ce 100644
--- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationModelExtensions.kt
+++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationModelExtensions.kt
@@ -14,21 +14,21 @@
* limitations under the License.
*/
-package com.android.server.pm.test.domain.verify
+package com.android.server.pm.test.verify.domain
-import android.content.pm.domain.verify.DomainVerificationRequest
-import android.content.pm.domain.verify.DomainVerificationSet
-import android.content.pm.domain.verify.DomainVerificationUserSelection
-import com.android.server.pm.domain.verify.DomainVerificationPersistence
+import android.content.pm.verify.domain.DomainVerificationRequest
+import android.content.pm.verify.domain.DomainVerificationInfo
+import android.content.pm.verify.domain.DomainVerificationUserSelection
+import com.android.server.pm.verify.domain.DomainVerificationPersistence
operator fun <F> android.util.Pair<F, *>.component1() = first
operator fun <S> android.util.Pair<*, S>.component2() = second
operator fun DomainVerificationRequest.component1() = packageNames
-operator fun DomainVerificationSet.component1() = identifier
-operator fun DomainVerificationSet.component2() = packageName
-operator fun DomainVerificationSet.component3() = hostToStateMap
+operator fun DomainVerificationInfo.component1() = identifier
+operator fun DomainVerificationInfo.component2() = packageName
+operator fun DomainVerificationInfo.component3() = hostToStateMap
operator fun DomainVerificationUserSelection.component1() = identifier
operator fun DomainVerificationUserSelection.component2() = packageName
diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationPersistenceTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationPersistenceTest.kt
similarity index 95%
rename from services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationPersistenceTest.kt
rename to services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationPersistenceTest.kt
index ada5c1b..a76152c 100644
--- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationPersistenceTest.kt
+++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationPersistenceTest.kt
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package com.android.server.pm.test.domain.verify
+package com.android.server.pm.test.verify.domain
-import android.content.pm.domain.verify.DomainVerificationManager
+import android.content.pm.verify.domain.DomainVerificationManager
import android.util.ArrayMap
import android.util.TypedXmlPullParser
import android.util.TypedXmlSerializer
import android.util.Xml
-import com.android.server.pm.domain.verify.DomainVerificationPersistence
-import com.android.server.pm.domain.verify.models.DomainVerificationPkgState
-import com.android.server.pm.domain.verify.models.DomainVerificationStateMap
-import com.android.server.pm.domain.verify.models.DomainVerificationUserState
+import com.android.server.pm.verify.domain.DomainVerificationPersistence
+import com.android.server.pm.verify.domain.models.DomainVerificationPkgState
+import com.android.server.pm.verify.domain.models.DomainVerificationStateMap
+import com.android.server.pm.verify.domain.models.DomainVerificationUserState
import com.google.common.truth.Truth.assertThat
import com.google.common.truth.Truth.assertWithMessage
import org.junit.Rule
diff --git a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationProxyTest.kt b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationProxyTest.kt
similarity index 93%
rename from services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationProxyTest.kt
rename to services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationProxyTest.kt
index 7519ff0..db541f6 100644
--- a/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/domain/verify/DomainVerificationProxyTest.kt
+++ b/services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationProxyTest.kt
@@ -14,26 +14,26 @@
* limitations under the License.
*/
-package com.android.server.pm.test.domain.verify
+package com.android.server.pm.test.verify.domain
import android.content.ComponentName
import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.content.pm.PackageManager
-import android.content.pm.domain.verify.DomainVerificationManager
-import android.content.pm.domain.verify.DomainVerificationRequest
-import android.content.pm.domain.verify.DomainVerificationSet
-import android.content.pm.domain.verify.DomainVerificationState
+import android.content.pm.verify.domain.DomainVerificationManager
+import android.content.pm.verify.domain.DomainVerificationRequest
+import android.content.pm.verify.domain.DomainVerificationInfo
+import android.content.pm.verify.domain.DomainVerificationState
import android.os.Bundle
import android.os.UserHandle
import android.util.ArraySet
import com.android.server.DeviceIdleInternal
-import com.android.server.pm.domain.verify.DomainVerificationCollector
-import com.android.server.pm.domain.verify.DomainVerificationManagerInternal
-import com.android.server.pm.domain.verify.proxy.DomainVerificationProxy
-import com.android.server.pm.domain.verify.proxy.DomainVerificationProxyV1
-import com.android.server.pm.domain.verify.proxy.DomainVerificationProxyV2
+import com.android.server.pm.verify.domain.DomainVerificationCollector
+import com.android.server.pm.verify.domain.DomainVerificationManagerInternal
+import com.android.server.pm.verify.domain.proxy.DomainVerificationProxy
+import com.android.server.pm.verify.domain.proxy.DomainVerificationProxyV1
+import com.android.server.pm.verify.domain.proxy.DomainVerificationProxyV2
import com.android.server.pm.parsing.pkg.AndroidPackage
import com.android.server.testutils.mockThrowOnUnmocked
import com.android.server.testutils.whenever
@@ -95,23 +95,27 @@
)
}
manager = mockThrowOnUnmocked {
- whenever(getDomainVerificationSetId(any())) {
+ whenever(getDomainVerificationInfoId(any())) {
when (val pkgName = arguments[0] as String) {
TEST_PKG_NAME_TARGET_ONE -> TEST_UUID_ONE
TEST_PKG_NAME_TARGET_TWO -> TEST_UUID_TWO
else -> throw IllegalArgumentException("Unexpected package name $pkgName")
}
}
- whenever(getDomainVerificationSet(anyString())) {
+ whenever(getDomainVerificationInfo(anyString())) {
when (val pkgName = arguments[0] as String) {
- TEST_PKG_NAME_TARGET_ONE -> DomainVerificationSet(TEST_UUID_ONE, pkgName, mapOf(
- "example1.com" to DomainVerificationManager.STATE_NO_RESPONSE,
- "example2.com" to DomainVerificationManager.STATE_NO_RESPONSE
- ))
- TEST_PKG_NAME_TARGET_TWO -> DomainVerificationSet(TEST_UUID_TWO, pkgName, mapOf(
- "example3.com" to DomainVerificationManager.STATE_NO_RESPONSE,
- "example4.com" to DomainVerificationManager.STATE_NO_RESPONSE
- ))
+ TEST_PKG_NAME_TARGET_ONE -> DomainVerificationInfo(
+ TEST_UUID_ONE, pkgName, mapOf(
+ "example1.com" to DomainVerificationManager.STATE_NO_RESPONSE,
+ "example2.com" to DomainVerificationManager.STATE_NO_RESPONSE
+ )
+ )
+ TEST_PKG_NAME_TARGET_TWO -> DomainVerificationInfo(
+ TEST_UUID_TWO, pkgName, mapOf(
+ "example3.com" to DomainVerificationManager.STATE_NO_RESPONSE,
+ "example4.com" to DomainVerificationManager.STATE_NO_RESPONSE
+ )
+ )
else -> throw IllegalArgumentException("Unexpected package name $pkgName")
}
}
diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt b/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt
index c78b24a..6e27b3a 100644
--- a/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt
+++ b/services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt
@@ -59,12 +59,12 @@
import com.android.server.compat.PlatformCompat
import com.android.server.extendedtestutils.wheneverStatic
import com.android.server.pm.dex.DexManager
-import com.android.server.pm.domain.verify.DomainVerificationManagerInternal
import com.android.server.pm.parsing.PackageParser2
import com.android.server.pm.parsing.pkg.AndroidPackage
import com.android.server.pm.parsing.pkg.PackageImpl
import com.android.server.pm.parsing.pkg.ParsedPackage
import com.android.server.pm.permission.PermissionManagerServiceInternal
+import com.android.server.pm.verify.domain.DomainVerificationManagerInternal
import com.android.server.testutils.TestHandler
import com.android.server.testutils.mock
import com.android.server.testutils.nullable
diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
index d8036bb..59458e8 100644
--- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
+++ b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
@@ -59,7 +59,7 @@
import com.android.permission.persistence.RuntimePermissionsPersistence;
import com.android.server.LocalServices;
-import com.android.server.pm.domain.verify.DomainVerificationManagerInternal;
+import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;
import com.android.server.pm.parsing.pkg.PackageImpl;
import com.android.server.pm.parsing.pkg.ParsedPackage;
import com.android.server.pm.permission.LegacyPermissionDataProvider;
diff --git a/services/tests/servicestests/src/com/android/server/pm/ScanTests.java b/services/tests/servicestests/src/com/android/server/pm/ScanTests.java
index 70abf82..b5add84 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ScanTests.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ScanTests.java
@@ -50,7 +50,7 @@
import android.util.Pair;
import com.android.server.compat.PlatformCompat;
-import com.android.server.pm.domain.verify.DomainVerificationManagerInternal;
+import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;
import com.android.server.pm.parsing.PackageInfoUtils;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import com.android.server.pm.parsing.pkg.PackageImpl;