diff options
| author | 2022-03-23 14:22:47 +0000 | |
|---|---|---|
| committer | 2022-03-23 14:22:47 +0000 | |
| commit | 325cbe552f12883648389aa80c9821e928c749c4 (patch) | |
| tree | 5851a814437c2a3dd49cf0728f6adcf30b507e9a | |
| parent | a3e1134c464ff82edf41f3c5c7b7f3ee4ca92a38 (diff) | |
| parent | abfe26db447fb7365ae4ec5a86325f5d08e2abb8 (diff) | |
Merge "Add DISPLAY_HASH_SERVICE to ServiceName list" into tm-dev
| -rw-r--r-- | core/java/android/content/Context.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 24b1b6adb450..5dd68a9fcfc9 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -3913,6 +3913,7 @@ public abstract class Context { MEDIA_METRICS_SERVICE, //@hide: ATTESTATION_VERIFICATION_SERVICE, //@hide: SAFETY_CENTER_SERVICE, + DISPLAY_HASH_SERVICE, }) @Retention(RetentionPolicy.SOURCE) public @interface ServiceName {} @@ -3999,6 +4000,8 @@ public abstract class Context { * <dt> {@link #DOMAIN_VERIFICATION_SERVICE} ("domain_verification") * <dd> A {@link android.content.pm.verify.domain.DomainVerificationManager} for accessing * web domain approval state. + * <dt> {@link #DISPLAY_HASH_SERVICE} ("display_hash") + * <dd> A {@link android.view.displayhash.DisplayHashManager} for management of display hashes. * </dl> * * <p>Note: System services obtained via this API may be closely associated with @@ -4082,6 +4085,8 @@ public abstract class Context { * @see #HARDWARE_PROPERTIES_SERVICE * @see #DOMAIN_VERIFICATION_SERVICE * @see android.content.pm.verify.domain.DomainVerificationManager + * @see #DISPLAY_HASH_SERVICE + * @see android.view.displayhash.DisplayHashManager */ public abstract @Nullable Object getSystemService(@ServiceName @NonNull String name); @@ -4102,7 +4107,8 @@ public abstract class Context { * {@link android.app.UiModeManager}, {@link android.app.DownloadManager}, * {@link android.os.BatteryManager}, {@link android.app.job.JobScheduler}, * {@link android.app.usage.NetworkStatsManager}, - * {@link android.content.pm.verify.domain.DomainVerificationManager}. + * {@link android.content.pm.verify.domain.DomainVerificationManager}, + * {@link android.view.displayhash.DisplayHashManager}. * </p> * * <p> |