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

Commit 176af337 authored by Jimmy Chen's avatar Jimmy Chen Committed by Android (Google) Code Review
Browse files

Merge "wifi: extend feature flag from int to long"

parents 6152cffb df3ad8c5

wifi/java/android/net/wifi/IWifiManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import android.os.WorkSource; 
 */

interface IWifiManager

{

    int getSupportedFeatures();

    long getSupportedFeatures();



    WifiActivityEnergyInfo reportActivityInfo();

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

+2 −2
Original line number Diff line number Diff line
@@ -2083,7 +2083,7 @@ public class WifiManager { 
    /** @hide */

    public static final int WIFI_FEATURE_DPP              = 0x80000000; // DPP (Easy-Connect)



    private int getSupportedFeatures() {

    private long getSupportedFeatures() {

        try {

            return mService.getSupportedFeatures();

        } catch (RemoteException e) {
@@ -2091,7 +2091,7 @@ public class WifiManager { 
        }

    }



    private boolean isFeatureSupported(int feature) {

    private boolean isFeatureSupported(long feature) {

        return (getSupportedFeatures() & feature) == feature;

    }

    /**

wifi/java/com/android/server/wifi/BaseWifiService.java

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class BaseWifiService extends IWifiManager.Stub { 
    private static final String TAG = BaseWifiService.class.getSimpleName();



    @Override

    public int getSupportedFeatures() {

    public long getSupportedFeatures() {

        throw new UnsupportedOperationException();

    }