Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ic7afab228d5d1bb8f222fb2e828674b03c9dd3e4
This commit is contained in:
Automerger Merge Worker
2020-01-08 03:31:37 +00:00
parent cb0b5bd957 fb1647dd3a
commit 506e7c6b35
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -1553,6 +1553,7 @@ package android.content {
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";

1
core/java/android/content/Context.java
View File

@@ -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";