diff options
| author | Adrian Roos <roosa@google.com> | 2020-01-17 12:48:33 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2020-01-17 12:48:33 -0800 |
| commit | 72bb1fa6c2ffb06bf0f58077391161e76d2055f0 (patch) | |
| tree | aa7fbf7f97d64fbb6c3363be87c7c5203a8a7158 /core/java/android | |
| parent | 002ba59e2b44ba4bbb3413707642538a006f2fbe (diff) | |
| parent | 3b35f3dfef58fd7f70aa0248a09ae0051a544691 (diff) | |
Merge "API: Supress existing inconsistent Context service names"
am: 3b35f3dfef
Change-Id: I93d19a74fc2194b7f088069e3b89a9a28917e54a
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/Context.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index f2f905126715..cd4af968ebfc 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -30,6 +30,7 @@ import android.annotation.StringDef; import android.annotation.StringRes; import android.annotation.StyleRes; import android.annotation.StyleableRes; +import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.TestApi; import android.annotation.UserIdInt; @@ -3827,6 +3828,7 @@ public abstract class Context { */ @SystemApi @TestApi + @SuppressLint("ServiceName") public static final String STATUS_BAR_SERVICE = "statusbar"; /** @@ -3921,6 +3923,7 @@ public abstract class Context { public static final String NETWORK_STATS_SERVICE = "netstats"; /** {@hide} */ @SystemApi + @SuppressLint("ServiceName") public static final String NETWORK_POLICY_SERVICE = "netpolicy"; /** {@hide} */ public static final String NETWORK_WATCHLIST_SERVICE = "network_watchlist"; @@ -4230,6 +4233,7 @@ public abstract class Context { * @see #getSystemService(String) */ @TestApi + @SuppressLint("ServiceName") // TODO: This should be renamed to CONTENT_CAPTURE_SERVICE public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture"; /** |