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

Merge "Add @MeteredOverride annotation to setPasspointMeteredOverride()" into rvc-dev am: 4812dfa61f am: 33915af911

Browse Source 
Change-Id: I757e8af65679c47d1f1917a1ed13d0cde36c5e57
This commit is contained in:
Automerger Merge Worker
2020-03-03 02:57:12 +00:00
parent acbae15aad 33915af911
commit 09969e15a7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4430,7 +4430,8 @@ public class WifiManager {
*/ */
@SystemApi @SystemApi
@RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) @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 { try {
mService.setPasspointMeteredOverride(fqdn, meteredOverride); mService.setPasspointMeteredOverride(fqdn, meteredOverride);
} catch (RemoteException e) { } catch (RemoteException e) {