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

Commit c104dbe8 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 am: 09969e15 am: 469936f3

Change-Id: I6ebbc8b9f934af685d0b332d3292b26e32edee53
parents 60eaabc6 469936f3

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

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