summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-08 03:43:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-08 03:43:52 +0000
commit6b913b90540807d092fc611bce0f97530b617ecc (patch)
tree3694ab1dfb1112b30ae19b1407bbb73065389730 /core/java
parent85f908e1c6f47566e51c4670799adb2474ad6320 (diff)
parent506e7c6b35780240e0f780be69b2f2f89feaff44 (diff)
Merge "Make Context.NETWORK_POLICY_SERVICE @SystemApi" am: b5b0b321f6 am: fb1647dd3a am: 506e7c6b35
Change-Id: Iee3cbf1c945d15ccd1d42108db8e0d3c3f0d481c
Diffstat (limited to 'core/java')
-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 4815d7847115..a28868ef38f8 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -3992,6 +3992,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";