Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 506e7c6b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make Context.NETWORK_POLICY_SERVICE @SystemApi" am: b5b0b321 am: fb1647dd 

Change-Id: Ic7afab228d5d1bb8f222fb2e828674b03c9dd3e4
parents cb0b5bd9 fb1647dd

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/java/android/content/Context.java

+1 −0
Original line number Diff line number Diff line
@@ -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";