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

Commit 65d3c6d9 authored by Steven Liu's avatar Steven Liu Committed by Android (Google) Code Review
Browse files

Merge "make ACTION_NETWORK_SETTINGS_RESET to be system API"

parents 181d11cb c244b81b

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5521,6 +5521,7 @@ package android.net.wifi { 
    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void updateInterfaceIpState(@Nullable String, int);

    method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public void updateWifiUsabilityScore(int, int, int);

    field public static final String ACTION_LINK_CONFIGURATION_CHANGED = "android.net.wifi.LINK_CONFIGURATION_CHANGED";

    field @RequiresPermission(android.Manifest.permission.NETWORK_CARRIER_PROVISIONING) public static final String ACTION_NETWORK_SETTINGS_RESET = "android.net.wifi.action.NETWORK_SETTINGS_RESET";

    field public static final String ACTION_PASSPOINT_LAUNCH_OSU_VIEW = "android.net.wifi.action.PASSPOINT_LAUNCH_OSU_VIEW";

    field public static final String ACTION_REQUEST_DISABLE = "android.net.wifi.action.REQUEST_DISABLE";

    field public static final String ACTION_REQUEST_ENABLE = "android.net.wifi.action.REQUEST_ENABLE";

wifi/java/android/net/wifi/WifiManager.java

+3 −1
Original line number Diff line number Diff line
@@ -723,7 +723,9 @@ public class WifiManager { 
     * had been reset.

     * @hide

     */

    public static final String WIFI_NETWORK_SETTINGS_RESET_ACTION =

    @SystemApi

    @RequiresPermission(android.Manifest.permission.NETWORK_CARRIER_PROVISIONING)

    public static final String ACTION_NETWORK_SETTINGS_RESET =

            "android.net.wifi.action.NETWORK_SETTINGS_RESET";



    /**