Merge "Rename setMeteredOverridePasspoint to setPasspointMeteredOverride" into rvc-dev

2 files changed, 10 insertions, 4 deletions

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,12 +196,18 @@ 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 f4d08454d..3b4e064f6 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -2554,19 +2554,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));