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

Commit 5a0e3a79 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Remove Context.NETWORK_POLICY_SERVICE from @SystemApi" into... 

Merge "Merge "Remove Context.NETWORK_POLICY_SERVICE from @SystemApi" into rvc-dev am: 9f48409d am: fa5baf35" into rvc-d1-dev-plus-aosp am: e554dfc3 am: fe2c32bf

Change-Id: I1bb8aa47db85591d80829f58366a66b098f426d9
parents 3a0bc40a fe2c32bf

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -1732,7 +1732,6 @@ 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

+0 −2
Original line number Diff line number Diff line
@@ -4065,8 +4065,6 @@ public abstract class Context { 
     */

    public static final String NETWORK_STATS_SERVICE = "netstats";

    /** {@hide} */

    @SystemApi

    @SuppressLint("ServiceName")

    public static final String NETWORK_POLICY_SERVICE = "netpolicy";

    /** {@hide} */

    public static final String NETWORK_WATCHLIST_SERVICE = "network_watchlist";