From 509cf521193acfda548fc465cbf916cf3fdc3828 Mon Sep 17 00:00:00 2001 From: Quang Luong Date: Thu, 27 Feb 2020 17:57:46 -0800 Subject: Rename setMeteredOverridePasspoint to setPasspointMeteredOverride Renaming as per Android API Council request. Bug: 150204647 Test: build, atest WifiServiceImplTest Change-Id: I4f8ac94482b6ab14247228d228d90f64afbc3c10 --- service/java/com/android/server/wifi/BaseWifiService.java | 8 +++++++- service/java/com/android/server/wifi/WifiServiceImpl.java | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'service') diff --git a/service/java/com/android/server/wifi/BaseWifiService.java b/service/java/com/android/server/wifi/BaseWifiService.java index 16e8eb5ee..34d902413 100644 --- a/service/java/com/android/server/wifi/BaseWifiService.java +++ b/service/java/com/android/server/wifi/BaseWifiService.java @@ -196,11 +196,17 @@ public class BaseWifiService extends IWifiManager.Stub { throw new UnsupportedOperationException(); } - @Override + /** @deprecated use {@link #setPasspointMeteredOverride} instead */ + @Deprecated public void setMeteredOverridePasspoint(String fqdn, int meteredOverride) { throw new UnsupportedOperationException(); } + @Override + public void setPasspointMeteredOverride(String fqdn, int meteredOverride) { + throw new UnsupportedOperationException(); + } + @Override public boolean startScan(String packageName, String featureId) { throw new UnsupportedOperationException(); diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index acb060dfc..b72bfbdf8 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -2552,19 +2552,19 @@ public class WifiServiceImpl extends BaseWifiService { } /** - * See {@link android.net.wifi.WifiManager#setMeteredOverridePasspoint(String, boolean)} + * See {@link android.net.wifi.WifiManager#setPasspointMeteredOverride(String, boolean)} * @param fqdn the FQDN that identifies the passpoint configuration * @param meteredOverride One of the values in {@link MeteredOverride} */ @Override - public void setMeteredOverridePasspoint(String fqdn, int meteredOverride) { + public void setPasspointMeteredOverride(String fqdn, int meteredOverride) { enforceNetworkSettingsPermission(); if (fqdn == null) { throw new IllegalArgumentException("FQDN cannot be null"); } int callingUid = Binder.getCallingUid(); - mLog.info("setMeteredOverridePasspoint=% uid=%") + mLog.info("setPasspointMeteredOverride=% uid=%") .c(meteredOverride).c(callingUid).flush(); mWifiThreadRunner.post( () -> mPasspointManager.setMeteredOverride(fqdn, meteredOverride)); -- cgit v1.2.3