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

Commit 72ee6cba authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes from topic "am-0a134e0bcf3646c585b6c1147798cd1f" into... 

Merge changes from topic "am-0a134e0bcf3646c585b6c1147798cd1f" into rvc-qpr-dev-plus-aosp am: f40d9b8d

Change-Id: I241195cf822636cff757ba41e3ad56903519d984
parents 4fbd0c2e f40d9b8d

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7337,7 +7337,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();