summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAaron Huang <huangaaron@google.com>2020-01-07 19:28:04 -0800
committerandroid-build-merger <android-build-merger@google.com>2020-01-07 19:28:04 -0800
commitfb1647dd3a303a1a9733aa67b8f2d350f117bbc2 (patch)
treef57718248e21166b9c201440be2091d1806c9d1b /core/java/android
parent08be4d351048d923a2c9abc4d60f28859c748178 (diff)
parentb5b0b321f67c58af57d88cff3a6c78673489e8b3 (diff)
Merge "Make Context.NETWORK_POLICY_SERVICE @SystemApi"
am: b5b0b321f6 Change-Id: I38532656d6abc4106399d14aa53230bf5b18f63b
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/Context.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 902c6b9dd36d..f3596411fb6b 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -3918,6 +3918,7 @@ public abstract class Context {
*/
public static final String NETWORK_STATS_SERVICE = "netstats";
/** {@hide} */
+ @SystemApi
public static final String NETWORK_POLICY_SERVICE = "netpolicy";
/** {@hide} */
public static final String NETWORK_WATCHLIST_SERVICE = "network_watchlist";