From aa06e85a29b84ee6445cc72c7a261c5dcf0d1f5e Mon Sep 17 00:00:00 2001
From: Quang Luong <qal@google.com>
Date: Thu, 27 Feb 2020 18:00:06 -0800
Subject: [PATCH] Rename setMeteredOverridePasspoint to
 setPasspointMeteredOverride

Renaming as per Android API Council request.

Bug: 150204647
Test: build
Change-Id: Id6c40eef43ce765fe379af68144d342413d3daa4
---
 api/system-current.txt                               | 2 +-
 wifi/java/android/net/wifi/IWifiManager.aidl         | 2 +-
 wifi/java/android/net/wifi/WifiManager.java          | 4 ++--
 wifi/tests/src/android/net/wifi/WifiManagerTest.java | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 3b95f32263411..9d692e1fafd86 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -7431,7 +7431,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 b1a4cac5864a6..b9dc349870ea0 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -4429,9 +4429,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);
     }
 
     /**