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

Commit c6b6ac43 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "WifiManager.factoryReset(): Fix incorrect permissions annotation" into... 

Merge "WifiManager.factoryReset(): Fix incorrect permissions annotation" into rvc-dev am: 72ec4f1e

Change-Id: Iad5a64a949d0c99afa54fb5e75b559826100b55a
parents 8c6b8c3e 72ec4f1e

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7328,7 +7328,7 @@ package android.net.wifi { 
    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void connect(int, @Nullable android.net.wifi.WifiManager.ActionListener);

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void disable(int, @Nullable android.net.wifi.WifiManager.ActionListener);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK}) public void disableEphemeralNetwork(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void factoryReset();

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void factoryReset();

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void forget(int, @Nullable android.net.wifi.WifiManager.ActionListener);

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.util.Pair<android.net.wifi.WifiConfiguration,java.util.Map<java.lang.Integer,java.util.List<android.net.wifi.ScanResult>>>> getAllMatchingWifiConfigs(@NonNull java.util.List<android.net.wifi.ScanResult>);

    method @Nullable @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public String getCountryCode();

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

+1 −1
Original line number Diff line number Diff line
@@ -4989,7 +4989,7 @@ public class WifiManager { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL)

    @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)

    public void factoryReset() {

        try {

            mService.factoryReset(mContext.getOpPackageName());