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

Commit 5679145d authored by Peter Qiu's avatar Peter Qiu
Browse files

hotspot2: update Passpoint intent definitions 

Address API Councils comment on the newly added intent definitions
for Passpoint events:
- Use a Parcelable class to represent icon info
- Document all extras that are included for an action
- Document that the new intents will only be sent to registered
  receivers, and not manifest receivers
- Rename extras to be more generic

While there, removed the deprecated hidden Passpoint intent
definitions.

Bug: 35857805
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I22de2d52fce3ed1adc8d72bf1580d3337bc747c5
Merged-In: I22de2d52fce3ed1adc8d72bf1580d3337bc747c5
parent d6998d4b

api/current.txt

+17 −12
Original line number Diff line number Diff line
@@ -24816,6 +24816,16 @@ package android.net.sip { 














package android.net.wifi {



























  public final class IconInfo implements android.os.Parcelable {













    ctor public IconInfo(java.lang.String, byte[]);













    ctor public IconInfo(android.net.wifi.IconInfo);













    method public int describeContents();













    method public byte[] getData();













    method public java.lang.String getFilename();













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













    field public static final android.os.Parcelable.Creator<android.net.wifi.IconInfo> CREATOR;













  }



























  public class ScanResult implements android.os.Parcelable {















    method public int describeContents();















    method public boolean is80211mcResponder();










@@ -25059,26 +25069,21 @@ package android.net.wifi {













    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 ERROR_AUTHENTICATING = 1; // 0x1













    field public static final java.lang.String EXTRA_ANQP_ELEMENT_DATA = "android.net.wifi.extra.ANQP_ELEMENT_DATA";















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













    field public static final java.lang.String EXTRA_BSSID_LONG = "android.net.wifi.extra.BSSID_LONG";













    field public static final java.lang.String EXTRA_DELAY = "android.net.wifi.extra.DELAY";













    field public static final java.lang.String EXTRA_ESS = "android.net.wifi.extra.ESS";













    field public static final java.lang.String EXTRA_ICON_INFO = "android.net.wifi.extra.ICON_INFO";















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















    field public static final java.lang.String EXTRA_NEW_RSSI = "newRssi";















    field public static final java.lang.String EXTRA_NEW_STATE = "newState";













    field public static final java.lang.String EXTRA_PASSPOINT_DEAUTH_IMMINENT_BSSID = "android.net.wifi.extra.PASSPOINT_DEAUTH_IMMINENT_BSSID";













    field public static final java.lang.String EXTRA_PASSPOINT_DEAUTH_IMMINENT_ESS = "android.net.wifi.extra.PASSPOINT_DEAUTH_IMMINENT_ESS";













    field public static final java.lang.String EXTRA_PASSPOINT_DEAUTH_IMMINENT_REASON_URL = "android.net.wifi.extra.PASSPOINT_DEAUTH_IMMINENT_REASON_URL";













    field public static final java.lang.String EXTRA_PASSPOINT_DEAUTH_IMMINENT_REAUTH_DELAY = "android.net.wifi.extra.PASSPOINT_DEAUTH_IMMINENT_REAUTH_DELAY";













    field public static final java.lang.String EXTRA_PASSPOINT_ICON_BSSID = "android.net.wifi.extra.PASSPOINT_ICON_BSSID";













    field public static final java.lang.String EXTRA_PASSPOINT_ICON_DATA = "android.net.wifi.extra.PASSPOINT_ICON_DATA";













    field public static final java.lang.String EXTRA_PASSPOINT_ICON_FILENAME = "android.net.wifi.extra.PASSPOINT_ICON_FILENAME";













    field public static final java.lang.String EXTRA_PASSPOINT_OSU_PROVIDERS_LIST_BSSID = "android.net.wifi.extra.PASSPOINT_OSU_PROVIDERS_LIST_BSSID";













    field public static final java.lang.String EXTRA_PASSPOINT_OSU_PROVIDERS_LIST_DATA = "android.net.wifi.extra.PASSPOINT_OSU_PROVIDERS_LIST_DATA";













    field public static final java.lang.String EXTRA_PASSPOINT_SUBSCRIPTION_REMEDIATION_BSSID = "android.net.wifi.extra.PASSPOINT_SUBSCRIPTION_REMEDIATION_BSSID";













    field public static final java.lang.String EXTRA_PASSPOINT_SUBSCRIPTION_REMEDIATION_SERVER_METHOD = "android.net.wifi.extra.PASSPOINT_SUBSCRIPTION_REMEDIATION_SERVER_METHOD";













    field public static final java.lang.String EXTRA_PASSPOINT_SUBSCRIPTION_REMEDIATION_SERVER_URL = "android.net.wifi.extra.PASSPOINT_SUBSCRIPTION_REMEDIATION_SERVER_URL";















    field public static final java.lang.String EXTRA_PREVIOUS_WIFI_STATE = "previous_wifi_state";















    field public static final java.lang.String EXTRA_RESULTS_UPDATED = "resultsUpdated";













    field public static final java.lang.String EXTRA_SUBSCRIPTION_REMEDIATION_METHOD = "android.net.wifi.extra.SUBSCRIPTION_REMEDIATION_METHOD";















    field public static final java.lang.String EXTRA_SUPPLICANT_CONNECTED = "connected";















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













    field public static final java.lang.String EXTRA_URL = "android.net.wifi.extra.URL";















    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 java.lang.String NETWORK_IDS_CHANGED_ACTION = "android.net.wifi.NETWORK_IDS_CHANGED";

























api/system-current.txt



+17
−12




























Original line number
Diff line number
Diff line








@@ -26968,6 +26968,16 @@ package android.net.wifi {













    field public boolean truncated;















  }



























  public final class IconInfo implements android.os.Parcelable {













    ctor public IconInfo(java.lang.String, byte[]);













    ctor public IconInfo(android.net.wifi.IconInfo);













    method public int describeContents();













    method public byte[] getData();













    method public java.lang.String getFilename();













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













    field public static final android.os.Parcelable.Creator<android.net.wifi.IconInfo> CREATOR;













  }



























  public class RttManager {















    method public void disableResponder(android.net.wifi.RttManager.ResponderCallback);















    method public void enableResponder(android.net.wifi.RttManager.ResponderCallback);










@@ -27456,29 +27466,24 @@ package android.net.wifi {













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















    field public static final java.lang.String CONFIGURED_NETWORKS_CHANGED_ACTION = "android.net.wifi.CONFIGURED_NETWORKS_CHANGE";















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













    field public static final java.lang.String EXTRA_ANQP_ELEMENT_DATA = "android.net.wifi.extra.ANQP_ELEMENT_DATA";















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













    field public static final java.lang.String EXTRA_BSSID_LONG = "android.net.wifi.extra.BSSID_LONG";















    field public static final java.lang.String EXTRA_CHANGE_REASON = "changeReason";













    field public static final java.lang.String EXTRA_DELAY = "android.net.wifi.extra.DELAY";













    field public static final java.lang.String EXTRA_ESS = "android.net.wifi.extra.ESS";













    field public static final java.lang.String EXTRA_ICON_INFO = "android.net.wifi.extra.ICON_INFO";















    field public static final java.lang.String EXTRA_MULTIPLE_NETWORKS_CHANGED = "multipleChanges";















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















    field public static final java.lang.String EXTRA_NEW_RSSI = "newRssi";















    field public static final java.lang.String EXTRA_NEW_STATE = "newState";













    field public static final java.lang.String EXTRA_PASSPOINT_DEAUTH_IMMINENT_BSSID = "android.net.wifi.extra.PASSPOINT_DEAUTH_IMMINENT_BSSID";













    field public static final java.lang.String EXTRA_PASSPOINT_DEAUTH_IMMINENT_ESS = "android.net.wifi.extra.PASSPOINT_DEAUTH_IMMINENT_ESS";













    field public static final java.lang.String EXTRA_PASSPOINT_DEAUTH_IMMINENT_REASON_URL = "android.net.wifi.extra.PASSPOINT_DEAUTH_IMMINENT_REASON_URL";













    field public static final java.lang.String EXTRA_PASSPOINT_DEAUTH_IMMINENT_REAUTH_DELAY = "android.net.wifi.extra.PASSPOINT_DEAUTH_IMMINENT_REAUTH_DELAY";













    field public static final java.lang.String EXTRA_PASSPOINT_ICON_BSSID = "android.net.wifi.extra.PASSPOINT_ICON_BSSID";













    field public static final java.lang.String EXTRA_PASSPOINT_ICON_DATA = "android.net.wifi.extra.PASSPOINT_ICON_DATA";













    field public static final java.lang.String EXTRA_PASSPOINT_ICON_FILENAME = "android.net.wifi.extra.PASSPOINT_ICON_FILENAME";













    field public static final java.lang.String EXTRA_PASSPOINT_OSU_PROVIDERS_LIST_BSSID = "android.net.wifi.extra.PASSPOINT_OSU_PROVIDERS_LIST_BSSID";













    field public static final java.lang.String EXTRA_PASSPOINT_OSU_PROVIDERS_LIST_DATA = "android.net.wifi.extra.PASSPOINT_OSU_PROVIDERS_LIST_DATA";













    field public static final java.lang.String EXTRA_PASSPOINT_SUBSCRIPTION_REMEDIATION_BSSID = "android.net.wifi.extra.PASSPOINT_SUBSCRIPTION_REMEDIATION_BSSID";













    field public static final java.lang.String EXTRA_PASSPOINT_SUBSCRIPTION_REMEDIATION_SERVER_METHOD = "android.net.wifi.extra.PASSPOINT_SUBSCRIPTION_REMEDIATION_SERVER_METHOD";













    field public static final java.lang.String EXTRA_PASSPOINT_SUBSCRIPTION_REMEDIATION_SERVER_URL = "android.net.wifi.extra.PASSPOINT_SUBSCRIPTION_REMEDIATION_SERVER_URL";















    field public static final java.lang.String EXTRA_PREVIOUS_WIFI_AP_STATE = "previous_wifi_state";















    field public static final java.lang.String EXTRA_PREVIOUS_WIFI_STATE = "previous_wifi_state";















    field public static final java.lang.String EXTRA_RESULTS_UPDATED = "resultsUpdated";













    field public static final java.lang.String EXTRA_SUBSCRIPTION_REMEDIATION_METHOD = "android.net.wifi.extra.SUBSCRIPTION_REMEDIATION_METHOD";















    field public static final java.lang.String EXTRA_SUPPLICANT_CONNECTED = "connected";















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













    field public static final java.lang.String EXTRA_URL = "android.net.wifi.extra.URL";















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















    field public static final java.lang.String EXTRA_WIFI_CONFIGURATION = "wifiConfiguration";















    field public static final java.lang.String EXTRA_WIFI_CREDENTIAL_EVENT_TYPE = "et";

























api/test-current.txt



+17
−12




























Original line number
Diff line number
Diff line








@@ -24889,6 +24889,16 @@ package android.net.sip {



























package android.net.wifi {



























  public final class IconInfo implements android.os.Parcelable {













    ctor public IconInfo(java.lang.String, byte[]);













    ctor public IconInfo(android.net.wifi.IconInfo);













    method public int describeContents();













    method public byte[] getData();













    method public java.lang.String getFilename();













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













    field public static final android.os.Parcelable.Creator<android.net.wifi.IconInfo> CREATOR;













  }



























  public class ScanResult implements android.os.Parcelable {















    method public int describeContents();















    method public boolean is80211mcResponder();










@@ -25132,26 +25142,21 @@ package android.net.wifi {













    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 ERROR_AUTHENTICATING = 1; // 0x1













    field public static final java.lang.String EXTRA_ANQP_ELEMENT_DATA = "android.net.wifi.extra.ANQP_ELEMENT_DATA";















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













    field public static final java.lang.String EXTRA_BSSID_LONG = "android.net.wifi.extra.BSSID_LONG";













    field public static final java.lang.String EXTRA_DELAY = "android.net.wifi.extra.DELAY";













    field public static final java.lang.String EXTRA_ESS = "android.net.wifi.extra.ESS";













    field public static final java.lang.String EXTRA_ICON_INFO = "android.net.wifi.extra.ICON_INFO";















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















    field public static final java.lang.String EXTRA_NEW_RSSI = "newRssi";















    field public static final java.lang.String EXTRA_NEW_STATE = "newState";













    field public static final java.lang.String EXTRA_PASSPOINT_DEAUTH_IMMINENT_BSSID = "android.net.wifi.extra.PASSPOINT_DEAUTH_IMMINENT_BSSID";













    field public static final java.lang.String EXTRA_PASSPOINT_DEAUTH_IMMINENT_ESS = "android.net.wifi.extra.PASSPOINT_DEAUTH_IMMINENT_ESS";













    field public static final java.lang.String EXTRA_PASSPOINT_DEAUTH_IMMINENT_REASON_URL = "android.net.wifi.extra.PASSPOINT_DEAUTH_IMMINENT_REASON_URL";













    field public static final java.lang.String EXTRA_PASSPOINT_DEAUTH_IMMINENT_REAUTH_DELAY = "android.net.wifi.extra.PASSPOINT_DEAUTH_IMMINENT_REAUTH_DELAY";













    field public static final java.lang.String EXTRA_PASSPOINT_ICON_BSSID = "android.net.wifi.extra.PASSPOINT_ICON_BSSID";













    field public static final java.lang.String EXTRA_PASSPOINT_ICON_DATA = "android.net.wifi.extra.PASSPOINT_ICON_DATA";













    field public static final java.lang.String EXTRA_PASSPOINT_ICON_FILENAME = "android.net.wifi.extra.PASSPOINT_ICON_FILENAME";













    field public static final java.lang.String EXTRA_PASSPOINT_OSU_PROVIDERS_LIST_BSSID = "android.net.wifi.extra.PASSPOINT_OSU_PROVIDERS_LIST_BSSID";













    field public static final java.lang.String EXTRA_PASSPOINT_OSU_PROVIDERS_LIST_DATA = "android.net.wifi.extra.PASSPOINT_OSU_PROVIDERS_LIST_DATA";













    field public static final java.lang.String EXTRA_PASSPOINT_SUBSCRIPTION_REMEDIATION_BSSID = "android.net.wifi.extra.PASSPOINT_SUBSCRIPTION_REMEDIATION_BSSID";













    field public static final java.lang.String EXTRA_PASSPOINT_SUBSCRIPTION_REMEDIATION_SERVER_METHOD = "android.net.wifi.extra.PASSPOINT_SUBSCRIPTION_REMEDIATION_SERVER_METHOD";













    field public static final java.lang.String EXTRA_PASSPOINT_SUBSCRIPTION_REMEDIATION_SERVER_URL = "android.net.wifi.extra.PASSPOINT_SUBSCRIPTION_REMEDIATION_SERVER_URL";















    field public static final java.lang.String EXTRA_PREVIOUS_WIFI_STATE = "previous_wifi_state";















    field public static final java.lang.String EXTRA_RESULTS_UPDATED = "resultsUpdated";













    field public static final java.lang.String EXTRA_SUBSCRIPTION_REMEDIATION_METHOD = "android.net.wifi.extra.SUBSCRIPTION_REMEDIATION_METHOD";















    field public static final java.lang.String EXTRA_SUPPLICANT_CONNECTED = "connected";















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













    field public static final java.lang.String EXTRA_URL = "android.net.wifi.extra.URL";















    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 java.lang.String NETWORK_IDS_CHANGED_ACTION = "android.net.wifi.NETWORK_IDS_CHANGED";

























wifi/java/android/net/wifi/IconInfo.aidl
0 → 100644



+19
−0




























Original line number
Diff line number
Diff line













/**













 * Copyright (c) 2017, 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 IconInfo;
























wifi/java/android/net/wifi/IconInfo.java
0 → 100644



+111
−0




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2017 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.Parcelable;













import android.text.TextUtils;













import android.os.Parcel;



























import java.util.Arrays;













import java.util.Objects;



























/**













 * A class representing icon information.













 */













public final class IconInfo implements Parcelable {













    /**













     * Name of the icon file.













     */













    private final String mFilename;



























    /**













     * Raw binary data of the icon.













     */













    private final byte[] mData;



























    public IconInfo(String filename, byte[] data) {













        mFilename = filename;













        mData = data;













    }



























    public IconInfo(IconInfo source) {













        if (source == null) {













            mFilename = null;













            mData = null;













            return;













        }



























        mFilename = source.mFilename;













        if (source.mData != null) {













            mData = Arrays.copyOf(source.mData, source.mData.length);













        } else {













            mData = null;













        }













    }



























    public String getFilename() {













        return mFilename;













    }



























    public byte[] getData() {













        return mData;













    }



























    @Override













    public boolean equals(Object thatObject) {













        if (this == thatObject) {













            return true;













        }













        if (!(thatObject instanceof IconInfo)) {













            return false;













        }













        IconInfo that = (IconInfo) thatObject;













        return TextUtils.equals(mFilename, that.mFilename)













                && Arrays.equals(mData, that.mData);













    }



























    @Override













    public int hashCode() {













        return Objects.hash(mFilename, mData);













    }



























    @Override













    public int describeContents() {













        return 0;













    }



























    @Override













    public void writeToParcel(Parcel dest, int flags) {













        dest.writeString(mFilename);













        dest.writeByteArray(mData);













    }



























    public static final Creator<IconInfo> CREATOR =













        new Creator<IconInfo>() {













            @Override













            public IconInfo createFromParcel(Parcel in) {













                String filename = in.readString();













                byte[] data = in.createByteArray();













                return new IconInfo(filename, data);













            }



























            @Override













            public IconInfo[] newArray(int size) {













                return new IconInfo[size];













            }













        };













}