From d2b6cf2c6f2716295fbf704770ce92a301f984af Mon Sep 17 00:00:00 2001
From: Winson <chiuwinson@google.com>
Date: Thu, 11 Mar 2021 15:17:33 -0800
Subject: [PATCH] Expose DOMAIN_VERIFICATION_SERVICE

With the getUserState public API, the constant should also be exposed
so that apps that wish to use that mechanism can access it.

Bug: 180955393

Test: builds

Change-Id: I98aa9a63eefc0480ddbf3107b91f76f0a2791f6b
---
 core/api/current.txt                   |  1 +
 core/api/system-current.txt            |  1 -
 core/java/android/content/Context.java | 15 +++++++++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index a0bec24e65f6d..9d6b4d608fade 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -10482,6 +10482,7 @@ package android.content {
     field public static final String DEVICE_POLICY_SERVICE = "device_policy";
     field public static final String DISPLAY_HASH_SERVICE = "display_hash";
     field public static final String DISPLAY_SERVICE = "display";
+    field public static final String DOMAIN_VERIFICATION_SERVICE = "domain_verification";
     field public static final String DOWNLOAD_SERVICE = "download";
     field public static final String DROPBOX_SERVICE = "dropbox";
     field public static final String EUICC_SERVICE = "euicc";
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index dee910dbd7b85..707d12b756cf3 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -2154,7 +2154,6 @@ package android.content {
     field public static final int BIND_ALLOW_FOREGROUND_SERVICE_STARTS_FROM_BACKGROUND = 262144; // 0x40000
     field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";
     field public static final String CONTEXTHUB_SERVICE = "contexthub";
-    field public static final String DOMAIN_VERIFICATION_SERVICE = "domain_verification";
     field public static final String ETHERNET_SERVICE = "ethernet";
     field public static final String EUICC_CARD_SERVICE = "euicc_card";
     field public static final String FONT_SERVICE = "font";
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 02e86cd4a863f..ca148d2f007b6 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -3705,6 +3705,9 @@ public abstract class Context {
      * usage statistics.
      * <dt> {@link #HARDWARE_PROPERTIES_SERVICE} ("hardware_properties")
      * <dd> A {@link android.os.HardwarePropertiesManager} for accessing hardware properties.
+     * <dt> {@link #DOMAIN_VERIFICATION_SERVICE} ("domain_verification")
+     * <dd> A {@link android.content.pm.verify.domain.DomainVerificationManager} for accessing
+     * web domain approval state.
      * </dl>
      *
      * <p>Note:  System services obtained via this API may be closely associated with
@@ -3786,6 +3789,8 @@ public abstract class Context {
      * @see android.app.usage.NetworkStatsManager
      * @see android.os.HardwarePropertiesManager
      * @see #HARDWARE_PROPERTIES_SERVICE
+     * @see #DOMAIN_VERIFICATION_SERVICE
+     * @see android.content.pm.verify.domain.DomainVerificationManager
      */
     public abstract @Nullable Object getSystemService(@ServiceName @NonNull String name);
 
@@ -3805,7 +3810,8 @@ public abstract class Context {
      * {@link android.view.inputmethod.InputMethodManager},
      * {@link android.app.UiModeManager}, {@link android.app.DownloadManager},
      * {@link android.os.BatteryManager}, {@link android.app.job.JobScheduler},
-     * {@link android.app.usage.NetworkStatsManager}.
+     * {@link android.app.usage.NetworkStatsManager},
+     * {@link android.content.pm.verify.domain.DomainVerificationManager}.
      * </p>
      *
      * <p>
@@ -5529,12 +5535,13 @@ public abstract class Context {
     public static final String GAME_SERVICE = "game";
 
     /**
-     * Use with {@link #getSystemService(String)} to access domain verification service.
+     * Use with {@link #getSystemService(String)} to access
+     * {@link android.content.pm.verify.domain.DomainVerificationManager} to retrieve approval and
+     * user state for declared web domains.
      *
      * @see #getSystemService(String)
-     * @hide
+     * @see android.content.pm.verify.domain.DomainVerificationManager
      */
-    @SystemApi
     public static final String DOMAIN_VERIFICATION_SERVICE = "domain_verification";
 
     /**