commit 6b913b90540807d092fc611bce0f97530b617ecc
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 08 03:43:52 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 08 03:43:52 2020 +0000
tree 3694ab1dfb1112b30ae19b1407bbb73065389730
parent 85f908e1c6f47566e51c4670799adb2474ad6320
parent 506e7c6b35780240e0f780be69b2f2f89feaff44

Merge "Make Context.NETWORK_POLICY_SERVICE @SystemApi" am: b5b0b321f6 am: fb1647dd3a am: 506e7c6b35

Change-Id: Iee3cbf1c945d15ccd1d42108db8e0d3c3f0d481c

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index ff23f3c..1146522 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1683,6 +1683,7 @@
     field public static final String EUICC_CARD_SERVICE = "euicc_card";
     field public static final String HDMI_CONTROL_SERVICE = "hdmi_control";
     field public static final String NETD_SERVICE = "netd";
+    field public static final String NETWORK_POLICY_SERVICE = "netpolicy";
     field public static final String NETWORK_SCORE_SERVICE = "network_score";
     field public static final String OEM_LOCK_SERVICE = "oem_lock";
     field public static final String PERMISSION_SERVICE = "permission";

core/java/android/content/Context.java

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 4815d78..a28868e 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -3992,6 +3992,7 @@
      */
     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";