summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-03-03 02:31:32 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-03-03 02:31:32 +0000
commit4812dfa61f844794ccd8cc5d29e75fc5d1d1b292 (patch)
tree19b3fd97df588c83d69184cb68f3fff7145adf2e
parentcada936a3692e7cb537bbba2ce24de3909ed135b (diff)
parent87ca1ac633fa09095cfdb9d9afec68cbfa091184 (diff)
Merge "Add @MeteredOverride annotation to setPasspointMeteredOverride()" into rvc-dev
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 6487e8390374..a262c92b8b29 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -4430,7 +4430,8 @@ public class WifiManager {
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)
- public void setPasspointMeteredOverride(@NonNull String fqdn, int meteredOverride) {
+ public void setPasspointMeteredOverride(@NonNull String fqdn,
+ @WifiConfiguration.MeteredOverride int meteredOverride) {
try {
mService.setPasspointMeteredOverride(fqdn, meteredOverride);
} catch (RemoteException e) {