diff --git a/api/system-current.txt b/api/system-current.txt index 225ba94025bf6..3ac4079885c04 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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); diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index 3025caf740009..30a76e463f67e 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -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); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 48526abd694b1..6487e83903741 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -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(); } diff --git a/wifi/tests/src/android/net/wifi/WifiManagerTest.java b/wifi/tests/src/android/net/wifi/WifiManagerTest.java index 234d929fc05ad..76ac8373374ac 100644 --- a/wifi/tests/src/android/net/wifi/WifiManagerTest.java +++ b/wifi/tests/src/android/net/wifi/WifiManagerTest.java @@ -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); } /**