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

Commit 73f5d16a authored by Vinit Deshpande's avatar Vinit Deshpande
Browse files

Address API Council feedback for WifiAdapter/WPS APIs 

This change addresses concerns from the API review. Things that
are fixed are -

1. WifiAdapter is removed, until we have 'real' support for it
2. All the methods from WifiAdapter are moved to WifiManager
3. Changed WPSListener API names to be onFailed/onSucceeded et al
4. Removed ActionListener from WPS APIs, they now take WpsListener

Bug: 16403303
Bug: 17115004

Change-Id: Ia721dd95041acb3e50d16690319e3320fe550ff5
parent 551056ec

api/current.txt

+13 −33
Original line number Diff line number Diff line
@@ -17989,23 +17989,6 @@ package android.net.wifi { 
    enum_constant public static final android.net.wifi.SupplicantState UNINITIALIZED;

  }













  public class WifiAdapter implements android.os.Parcelable {













    method public int describeContents();













    method public java.lang.String getName();













    method public boolean is5GHzBandSupported();













    method public boolean isDeviceToApRttSupported();













    method public boolean isDeviceToDeviceRttSupported();













    method public boolean isEnhancedPowerReportingSupported();













    method public boolean isOffChannelTdlsSupported();













    method public boolean isP2pSupported();













    method public boolean isPasspointSupported();













    method public boolean isPortableHotspotSupported();













    method public boolean isPreferredNetworkOffloadSupported();













    method public boolean isTdlsSupported();













    method public boolean isWifiScannerSupported();













    method public void writeToParcel(android.os.Parcel, int);













  }



























  public class WifiConfiguration implements android.os.Parcelable {















    ctor public WifiConfiguration();















    method public int describeContents();










@@ -18139,7 +18122,7 @@ package android.net.wifi {













  public class WifiManager {















    method public int addNetwork(android.net.wifi.WifiConfiguration);















    method public static int calculateSignalLevel(int, int);













    method public void cancelWps(android.net.wifi.WifiManager.ActionListener);













    method public void cancelWps(android.net.wifi.WifiManager.WpsCallback);















    method public static int compareSignalLevel(int, int);















    method public android.net.wifi.WifiManager.MulticastLock createMulticastLock(java.lang.String);















    method public android.net.wifi.WifiManager.WifiLock createWifiLock(int, java.lang.String);









@@ -18147,13 +18130,18 @@ package android.net.wifi {













    method public boolean disableNetwork(int);















    method public boolean disconnect();















    method public boolean enableNetwork(int, boolean);













    method public java.util.List<android.net.wifi.WifiAdapter> getAdapters();















    method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();















    method public android.net.wifi.WifiInfo getConnectionInfo();















    method public android.net.DhcpInfo getDhcpInfo();















    method public java.util.List<android.net.wifi.ScanResult> getScanResults();















    method public int getWifiState();













    method public boolean is5GHzBandSupported();













    method public boolean isDeviceToApRttSupported();













    method public boolean isEnhancedPowerReportingSupported();













    method public boolean isP2pSupported();













    method public boolean isPreferredNetworkOffloadSupported();















    method public boolean isScanAlwaysAvailable();













    method public boolean isTdlsSupported();















    method public boolean isWifiEnabled();















    method public boolean pingSupplicant();















    method public boolean reassociate();









@@ -18164,12 +18152,10 @@ package android.net.wifi {













    method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);















    method public boolean setWifiEnabled(boolean);















    method public boolean startScan();













    method public void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsListener);













    method public void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsCallback);















    method public int updateNetwork(android.net.wifi.WifiConfiguration);















    field public static final java.lang.String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK";















    field public static final java.lang.String ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE = "android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE";













    field public static final int BUSY = 2; // 0x2













    field public static final int ERROR = 0; // 0x0















    field public static final int ERROR_AUTHENTICATING = 1; // 0x1















    field public static final java.lang.String EXTRA_BSSID = "bssid";















    field public static final java.lang.String EXTRA_NETWORK_INFO = "networkInfo";









@@ -18180,8 +18166,6 @@ package android.net.wifi {













    field public static final java.lang.String EXTRA_SUPPLICANT_ERROR = "supplicantError";















    field public static final java.lang.String EXTRA_WIFI_INFO = "wifiInfo";















    field public static final java.lang.String EXTRA_WIFI_STATE = "wifi_state";













    field public static final int INVALID_ARGS = 8; // 0x8













    field public static final int IN_PROGRESS = 1; // 0x1















    field public static final java.lang.String NETWORK_IDS_CHANGED_ACTION = "android.net.wifi.NETWORK_IDS_CHANGED";















    field public static final java.lang.String NETWORK_STATE_CHANGED_ACTION = "android.net.wifi.STATE_CHANGE";















    field public static final java.lang.String RSSI_CHANGED_ACTION = "android.net.wifi.RSSI_CHANGED";









@@ -18204,11 +18188,6 @@ package android.net.wifi {













    field public static final int WPS_WEP_PROHIBITED = 4; // 0x4















  }



























  public static abstract interface WifiManager.ActionListener {













    method public abstract void onFailure(int);













    method public abstract void onSuccess();













  }



























  public class WifiManager.MulticastLock {















    method public void acquire();















    method public boolean isHeld();









@@ -18224,10 +18203,11 @@ package android.net.wifi {













    method public void setWorkSource(android.os.WorkSource);















  }



























  public static abstract interface WifiManager.WpsListener {













    method public abstract void onCompletion();













    method public abstract void onFailure(int);













    method public abstract void onStartSuccess(java.lang.String);













  public static abstract class WifiManager.WpsCallback {













    ctor public WifiManager.WpsCallback();













    method public abstract void onFailed(int);













    method public abstract void onStarted(java.lang.String);













    method public abstract void onSucceeded();















  }





























  public class WpsInfo implements android.os.Parcelable {

























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



+2
−3




























Original line number
Diff line number
Diff line








@@ -18,7 +18,6 @@ package android.net.wifi;





























import android.net.wifi.BatchedScanResult;















import android.net.wifi.BatchedScanSettings;













import android.net.wifi.WifiAdapter;















import android.net.wifi.WifiConfiguration;















import android.net.wifi.WifiInfo;















import android.net.wifi.ScanSettings;









@@ -40,9 +39,9 @@ import android.os.WorkSource;













 */















interface IWifiManager















{













    List<WifiAdapter> getAdaptors();













    int getSupportedFeatures();





























    WifiActivityEnergyInfo reportActivityInfo(in WifiAdapter adapter);













    WifiActivityEnergyInfo reportActivityInfo();































    List<WifiConfiguration> getConfiguredNetworks();

















































wifi/java/android/net/wifi/WifiAdapter.aidl
deleted100644 → 0



+0
−19




























Original line number
Diff line number
Diff line













/**













 * Copyright (c) 2014, The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *     http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.net.wifi;



























parcelable WifiAdapter;
























wifi/java/android/net/wifi/WifiAdapter.java
deleted100644 → 0



+0
−257




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2014 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.net.wifi;



























import android.os.Parcel;













import android.os.Parcelable;













import android.os.RemoteException;













import android.util.Log;



























/**













 * Represents local wifi adapter. Different devices have different kinds of













 * wifi adapters; each with different capabilities. Use this class to find out













 * which capabilites are supported by the wifi adapter on the device.













 */













public class WifiAdapter implements Parcelable {













    private static final String TAG = "WifiAdapter";



























    /* Keep this list in sync with wifi_hal.h */













    /** @hide */













    public static final int WIFI_FEATURE_INFRA            = 0x0001;  // Basic infrastructure mode













    /** @hide */













    public static final int WIFI_FEATURE_INFRA_5G         = 0x0002;  // Support for 5 GHz Band













    /** @hide */













    public static final int WIFI_FEATURE_PASSPOINT        = 0x0004;  // Support for GAS/ANQP













    /** @hide */













    public static final int WIFI_FEATURE_P2P              = 0x0008;  // Wifi-Direct













    /** @hide */













    public static final int WIFI_FEATURE_MOBILE_HOTSPOT   = 0x0010;  // Soft AP













    /** @hide */













    public static final int WIFI_FEATURE_SCANNER          = 0x0020;  // WifiScanner APIs













    /** @hide */













    public static final int WIFI_FEATURE_NAN              = 0x0040;  // Neighbor Awareness Networking













    /** @hide */













    public static final int WIFI_FEATURE_D2D_RTT          = 0x0080;  // Device-to-device RTT













    /** @hide */













    public static final int WIFI_FEATURE_D2AP_RTT         = 0x0100;  // Device-to-AP RTT













    /** @hide */













    public static final int WIFI_FEATURE_BATCH_SCAN       = 0x0200;  // Batched Scan (deprecated)













    /** @hide */













    public static final int WIFI_FEATURE_PNO              = 0x0400;  // Preferred network offload













    /** @hide */













    public static final int WIFI_FEATURE_ADDITIONAL_STA   = 0x0800;  // Support for two STAs













    /** @hide */













    public static final int WIFI_FEATURE_TDLS             = 0x1000;  // Tunnel directed link setup













    /** @hide */













    public static final int WIFI_FEATURE_TDLS_OFFCHANNEL  = 0x2000;  // Support for TDLS off channel













    /** @hide */













    public static final int WIFI_FEATURE_EPR              = 0x4000;  // Enhanced power reporting



























    private static final int CONTROLLER_ENERGY_UPDATE_TIMEOUT_MILLIS = 30;













    /** @hide */













    public static final int ACTIVITY_ENERGY_INFO_CACHED = 0;













    /** @hide */













    public static final int ACTIVITY_ENERGY_INFO_REFRESHED = 1;



























    private String name;













    private int    supportedFeatures;



























    // Make the API consistent with BlueTooth Adaptor, allowing WifiService to be accessed













    // Directly from the adapter













    /** @hide */













    public IWifiManager mService = null;



























    /** @hide */













    public WifiAdapter(String name, int supportedFeatures) {













        this.name = name;













        this.supportedFeatures = supportedFeatures;













    }



























    /**













     * @return name of the adapter













     */













    public String getName() {













        return name;













    }



























    private int getSupportedFeatures() {













        return supportedFeatures;













    }



























    private boolean isFeatureSupported(int feature) {













        return (supportedFeatures & feature) == feature;













    }



























    /**













     * @return true if this adapter supports 5 GHz band













     */













    public boolean is5GHzBandSupported() {













        return isFeatureSupported(WIFI_FEATURE_INFRA_5G);













    }



























    /**













     * @return true if this adapter supports passpoint













     */













    public boolean isPasspointSupported() {













        return isFeatureSupported(WIFI_FEATURE_PASSPOINT);













    }



























    /**













     * @return true if this adapter supports WifiP2pManager (Wi-Fi Direct)













     */













    public boolean isP2pSupported() {













        return isFeatureSupported(WIFI_FEATURE_P2P);













    }



























    /**













     * @return true if this adapter supports portable Wi-Fi hotspot













     */













    public boolean isPortableHotspotSupported() {













        return isFeatureSupported(WIFI_FEATURE_MOBILE_HOTSPOT);













    }



























    /**













     * @return true if this adapter supports WifiScanner APIs













     */













    public boolean isWifiScannerSupported() {













        return isFeatureSupported(WIFI_FEATURE_SCANNER);













    }



























    /**













     * @return true if this adapter supports Neighbour Awareness Network APIs













     * @hide













     */













    public boolean isNanSupported() {













        return isFeatureSupported(WIFI_FEATURE_NAN);













    }



























    /**













     * @return true if this adapter supports Device-to-device RTT













     */













    public boolean isDeviceToDeviceRttSupported() {













        return isFeatureSupported(WIFI_FEATURE_D2D_RTT);













    }



























    /**













     * @return true if this adapter supports Device-to-AP RTT













     */













    public boolean isDeviceToApRttSupported() {













        return isFeatureSupported(WIFI_FEATURE_D2AP_RTT);













    }



























    /**













     * @return true if this adapter supports offloaded connectivity scan













     */













    public boolean isPreferredNetworkOffloadSupported() {













        return isFeatureSupported(WIFI_FEATURE_PNO);













    }



























    /**













     * @return true if this adapter supports multiple simultaneous connections













     * @hide













     */













    public boolean isAdditionalStaSupported() {













        return isFeatureSupported(WIFI_FEATURE_ADDITIONAL_STA);













    }



























    /**













     * @return true if this adapter supports Tunnel Directed Link Setup













     */













    public boolean isTdlsSupported() {













        return isFeatureSupported(WIFI_FEATURE_TDLS);













    }



























    /**













     * @return true if this adapter supports Off Channel Tunnel Directed Link Setup













     */













    public boolean isOffChannelTdlsSupported() {













        return isFeatureSupported(WIFI_FEATURE_TDLS_OFFCHANNEL);













    }



























    /**













     * @return true if this adapter supports advanced power/performance counters













     */













    public boolean isEnhancedPowerReportingSupported() {













        return isFeatureSupported(WIFI_FEATURE_EPR);













    }









































    /**













     * Return the record of {@link WifiActivityEnergyInfo} object that













     * has the activity and energy info. This can be used to ascertain what













     * the controller has been up to, since the last sample.













     * @param updateType Type of info, cached vs refreshed.













     *













     * @return a record with {@link WifiActivityEnergyInfo} or null if













     * report is unavailable or unsupported













     * @hide













     */













    public WifiActivityEnergyInfo getControllerActivityEnergyInfo(int updateType) {













        if (mService == null) return null;













        try {













            WifiActivityEnergyInfo record;













            if (!isEnhancedPowerReportingSupported()) {













                return null;













            }













            synchronized(this) {













                record = mService.reportActivityInfo(this);













                if (record.isValid()) {













                    return record;













                } else {













                    return null;













                }













            }













        } catch (RemoteException e) {













            Log.e(TAG, "getControllerActivityEnergyInfo: " + e);













        }













        return null;













    }



























    /* Parcelable implementation */













    /**













     * Implement the Parcelable interface













     * {@hide}













     */













    public int describeContents() {













        return 0;













    }



























    /**













     * Implement the Parcelable interface













     * {@hide}













     */













    public void writeToParcel(Parcel dest, int flags) {













        dest.writeString(name);













        dest.writeInt(supportedFeatures);













    }



























    /**













     * Implement the Parcelable interface













     * {@hide}













     */













    public static final Creator<WifiAdapter> CREATOR =













            new Creator<WifiAdapter>() {













                public WifiAdapter createFromParcel(Parcel in) {













                    WifiAdapter adaptor = new WifiAdapter(in.readString(), in.readInt());













                    return adaptor;













                }



























                public WifiAdapter[] newArray(int size) {













                    return new WifiAdapter[size];













                }













            };













}
























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



+209
−30


























File changed.
Preview size limit exceeded, changes collapsed.