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

Commit 8d3b702d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Rename setMeteredOverridePasspoint to setPasspointMeteredOverride" into... 

Merge "Rename setMeteredOverridePasspoint to setPasspointMeteredOverride" into rvc-dev am: bba804e8 am: a83e139d am: 145bcba5

Change-Id: Id39a3af6be167ddcc37e33ef1f7a6a44cf0051bb
parents d8f2212b 145bcba5

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7425,7 +7425,7 @@ package android.net.wifi { 
    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setAutoWakeupEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.WIFI_SET_DEVICE_MOBILITY_STATE) public void setDeviceMobilityState(int);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setMacRandomizationSettingPasspointEnabled(@NonNull String, boolean);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setMeteredOverridePasspoint(@NonNull String, int);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setPasspointMeteredOverride(@NonNull String, int);

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

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

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public boolean setSoftApConfiguration(@NonNull android.net.wifi.SoftApConfiguration);

wifi/java/android/net/wifi/IWifiManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ interface IWifiManager 


    void setMacRandomizationSettingPasspointEnabled(String fqdn, boolean enable);



    void setMeteredOverridePasspoint(String fqdn, int meteredOverride);

    void setPasspointMeteredOverride(String fqdn, int meteredOverride);



    boolean startScan(String packageName, String featureId);

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

+2 −2
Original line number Diff line number Diff line
@@ -4430,9 +4430,9 @@ public class WifiManager { 
     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)

    public void setMeteredOverridePasspoint(@NonNull String fqdn, int meteredOverride) {

    public void setPasspointMeteredOverride(@NonNull String fqdn, int meteredOverride) {

        try {

            mService.setMeteredOverridePasspoint(fqdn, meteredOverride);

            mService.setPasspointMeteredOverride(fqdn, meteredOverride);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

wifi/tests/src/android/net/wifi/WifiManagerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -1803,10 +1803,10 @@ public class WifiManagerTest { 
     * {@link WifiManager#setMacRandomizationSettingPasspointEnabled(String, boolean)}

     */

    @Test

    public void testSetMeteredOverridePasspoint() throws Exception {

    public void testSetPasspointMeteredOverride() throws Exception {

        final String fqdn = "FullyQualifiedDomainName";

        mWifiManager.setMeteredOverridePasspoint(fqdn, METERED_OVERRIDE_METERED);

        verify(mWifiService).setMeteredOverridePasspoint(fqdn, METERED_OVERRIDE_METERED);

        mWifiManager.setPasspointMeteredOverride(fqdn, METERED_OVERRIDE_METERED);

        verify(mWifiService).setPasspointMeteredOverride(fqdn, METERED_OVERRIDE_METERED);

    }



    /**