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

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

Merge "WifiManager.getCountryCode(): Change permission to NETWORK_SETTINGS"... 

Merge "WifiManager.getCountryCode(): Change permission to NETWORK_SETTINGS" into rvc-dev am: 26db1f92 am: c696aca6 am: 0506cba8

Change-Id: I49f03231eec629d1a292929f86329a2978058e62
parents 98e17069 0506cba8

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7330,7 +7330,7 @@ package android.net.wifi { 
    method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) 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.CONNECTIVITY_INTERNAL) public String getCountryCode();

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

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public android.net.Network getCurrentNetwork();

    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public String[] getFactoryMacAddresses();

    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,java.util.List<android.net.wifi.ScanResult>> getMatchingOsuProviders(@Nullable java.util.List<android.net.wifi.ScanResult>);

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

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

    @Nullable

    @SystemApi

    @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL)

    @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)

    public String getCountryCode() {

        try {

            return mService.getCountryCode();