Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ed11dc5 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add @MeteredOverride annotation to setPasspointMeteredOverride()" into... 

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

Change-Id: Ib1233d5a0713cc56cfb9eb9c0ccee82b0d30691c
parents 0d42e10d 33915af9

wifi/java/android/net/wifi/WifiManager.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {