Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename setMeteredOverridePasspoint to setPasspointMeteredOverride" into rvc-dev am: bba804e8f5 am: a83e139d9a

Browse Source 
Change-Id: I62c48009959cc5d2a0d08cfb7d7d51ce1161b0c7
This commit is contained in:
Automerger Merge Worker
2020-02-29 13:31:20 +00:00
parent 2130746775 a83e139d9a
commit 1b74f97c44
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -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);

2
wifi/java/android/net/wifi/IWifiManager.aidl
View File

@@ -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);

4
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -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();
}

6
wifi/tests/src/android/net/wifi/WifiManagerTest.java
View File

@@ -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);
}
/**