Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose DOMAIN_VERIFICATION_SERVICE" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-12 19:03:58 +00:00
committed by Android (Google) Code Review
parent 225b6d0bc6 d2b6cf2c6f
commit 3bc6fbcd6a
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -10501,6 +10501,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";

1
core/api/system-current.txt
View File

@@ -2162,7 +2162,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";

15
core/java/android/content/Context.java
View File

@@ -3713,6 +3713,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
@@ -3794,6 +3797,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);
@@ -3813,7 +3818,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>
@@ -5544,12 +5550,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";
/**