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

Commit 5df03b3d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topics 'Passpoint API update', 'Passpoint intent update' 

* changes:
  hotspot2: update Passpoint configuration management APIs
  hotspot2: hide validate method for Passpoint configuration
  Osu: temporarily comment out the usage of deprecated intent definitions
  hotspot2: update Passpoint intent definitions
parents b2afa1ed 3efd531e

api/current.txt

+19 −23
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();










@@ -25015,7 +25025,7 @@ package android.net.wifi {



























  public class WifiManager {















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













    method public boolean addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);













    method public void addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);















    method public static int calculateSignalLevel(int, int);















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















    method public static int compareSignalLevel(int, int);










@@ -25044,7 +25054,7 @@ package android.net.wifi {













    method public boolean reassociate();















    method public boolean reconnect();















    method public boolean removeNetwork(int);













    method public boolean removePasspointConfiguration(java.lang.String);













    method public void removePasspointConfiguration(java.lang.String);















    method public deprecated boolean saveConfiguration();















    method public void setTdlsEnabled(java.net.InetAddress, boolean);















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









@@ -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";










@@ -25297,7 +25302,6 @@ package android.net.wifi.hotspot2 {













    method public void setUsageLimitStartTimeInMs(long);















    method public void setUsageLimitTimeLimitInMinutes(long);















    method public void setUsageLimitUsageTimePeriodInMinutes(long);













    method public boolean validate();















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















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















  }










@@ -25338,7 +25342,6 @@ package android.net.wifi.hotspot2.pps {













    method public void setRealm(java.lang.String);















    method public void setSimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential);















    method public void setUserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential> CREATOR;















  }









@@ -25351,7 +25354,6 @@ package android.net.wifi.hotspot2.pps {













    method public java.lang.String getCertType();















    method public void setCertSha256Fingerprint(byte[]);















    method public void setCertType(java.lang.String);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.CertificateCredential> CREATOR;















  }









@@ -25364,7 +25366,6 @@ package android.net.wifi.hotspot2.pps {













    method public java.lang.String getImsi();















    method public void setEapType(int);















    method public void setImsi(java.lang.String);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.SimCredential> CREATOR;















  }









@@ -25387,7 +25388,6 @@ package android.net.wifi.hotspot2.pps {













    method public void setPassword(java.lang.String);















    method public void setSoftTokenApp(java.lang.String);















    method public void setUsername(java.lang.String);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.UserCredential> CREATOR;















  }









@@ -25412,7 +25412,6 @@ package android.net.wifi.hotspot2.pps {













    method public void setMatchAnyOis(long[]);















    method public void setOtherHomePartners(java.lang.String[]);















    method public void setRoamingConsortiumOis(long[]);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.HomeSp> CREATOR;















  }









@@ -25439,7 +25438,6 @@ package android.net.wifi.hotspot2.pps {













    method public void setPolicyUpdate(android.net.wifi.hotspot2.pps.UpdateParameter);















    method public void setPreferredRoamingPartnerList(java.util.List<android.net.wifi.hotspot2.pps.Policy.RoamingPartner>);















    method public void setRequiredProtoPortMap(java.util.Map<java.lang.Integer, java.lang.String>);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy> CREATOR;















  }









@@ -25456,7 +25454,6 @@ package android.net.wifi.hotspot2.pps {













    method public void setFqdn(java.lang.String);















    method public void setFqdnExactMatch(boolean);















    method public void setPriority(int);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy.RoamingPartner> CREATOR;















  }









@@ -25481,7 +25478,6 @@ package android.net.wifi.hotspot2.pps {













    method public void setUpdateIntervalInMinutes(long);















    method public void setUpdateMethod(java.lang.String);















    method public void setUsername(java.lang.String);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.UpdateParameter> CREATOR;















    field public static final long UPDATE_CHECK_INTERVAL_NEVER = 4294967295L; // 0xffffffffL

























api/system-current.txt



+19
−23




























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);










@@ -27393,7 +27403,7 @@ package android.net.wifi {



























  public class WifiManager {















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













    method public boolean addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);













    method public void addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);















    method public static int calculateSignalLevel(int, int);















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















    method public static int compareSignalLevel(int, int);










@@ -27433,7 +27443,7 @@ package android.net.wifi {













    method public boolean reassociate();















    method public boolean reconnect();















    method public boolean removeNetwork(int);













    method public boolean removePasspointConfiguration(java.lang.String);













    method public void removePasspointConfiguration(java.lang.String);















    method public deprecated boolean saveConfiguration();















    method public void setTdlsEnabled(java.net.InetAddress, boolean);















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









@@ -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";










@@ -27857,7 +27862,6 @@ package android.net.wifi.hotspot2 {













    method public void setUsageLimitStartTimeInMs(long);















    method public void setUsageLimitTimeLimitInMinutes(long);















    method public void setUsageLimitUsageTimePeriodInMinutes(long);













    method public boolean validate();















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















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















  }










@@ -27898,7 +27902,6 @@ package android.net.wifi.hotspot2.pps {













    method public void setRealm(java.lang.String);















    method public void setSimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential);















    method public void setUserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential> CREATOR;















  }









@@ -27911,7 +27914,6 @@ package android.net.wifi.hotspot2.pps {













    method public java.lang.String getCertType();















    method public void setCertSha256Fingerprint(byte[]);















    method public void setCertType(java.lang.String);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.CertificateCredential> CREATOR;















  }









@@ -27924,7 +27926,6 @@ package android.net.wifi.hotspot2.pps {













    method public java.lang.String getImsi();















    method public void setEapType(int);















    method public void setImsi(java.lang.String);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.SimCredential> CREATOR;















  }









@@ -27947,7 +27948,6 @@ package android.net.wifi.hotspot2.pps {













    method public void setPassword(java.lang.String);















    method public void setSoftTokenApp(java.lang.String);















    method public void setUsername(java.lang.String);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.UserCredential> CREATOR;















  }









@@ -27972,7 +27972,6 @@ package android.net.wifi.hotspot2.pps {













    method public void setMatchAnyOis(long[]);















    method public void setOtherHomePartners(java.lang.String[]);















    method public void setRoamingConsortiumOis(long[]);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.HomeSp> CREATOR;















  }









@@ -27999,7 +27998,6 @@ package android.net.wifi.hotspot2.pps {













    method public void setPolicyUpdate(android.net.wifi.hotspot2.pps.UpdateParameter);















    method public void setPreferredRoamingPartnerList(java.util.List<android.net.wifi.hotspot2.pps.Policy.RoamingPartner>);















    method public void setRequiredProtoPortMap(java.util.Map<java.lang.Integer, java.lang.String>);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy> CREATOR;















  }









@@ -28016,7 +28014,6 @@ package android.net.wifi.hotspot2.pps {













    method public void setFqdn(java.lang.String);















    method public void setFqdnExactMatch(boolean);















    method public void setPriority(int);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy.RoamingPartner> CREATOR;















  }









@@ -28041,7 +28038,6 @@ package android.net.wifi.hotspot2.pps {













    method public void setUpdateIntervalInMinutes(long);















    method public void setUpdateMethod(java.lang.String);















    method public void setUsername(java.lang.String);













    method public boolean validate();















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















    field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.UpdateParameter> CREATOR;















    field public static final long UPDATE_CHECK_INTERVAL_NEVER = 4294967295L; // 0xffffffffL

























api/test-current.txt



+19
−23


























File changed.
Preview size limit exceeded, changes collapsed.
























packages/Osu/src/com/android/MainActivity.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -246,6 +246,8 @@ public class MainActivity extends Activity {













                case WifiManager.SCAN_RESULTS_AVAILABLE_ACTION:















                    mOsuManager.pushScanResults(wifiManager.getScanResults());















                    break;













                // TODO(b/32883320): use updated intent.













                /*















                case WifiManager.PASSPOINT_WNM_FRAME_RECEIVED_ACTION:















                    long bssid = bundle.getLong(WifiManager.EXTRA_PASSPOINT_WNM_BSSID);















                    String url = bundle.getString(WifiManager.EXTRA_PASSPOINT_WNM_URL);










@@ -282,6 +284,7 @@ public class MainActivity extends Activity {













                            bundle.getString(WifiManager.EXTRA_PASSPOINT_ICON_FILE),















                            bundle.getByteArray(WifiManager.EXTRA_PASSPOINT_ICON_DATA));















                    break;













                */















                case WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION:















                    mOsuManager.networkConfigChange((WifiConfiguration)















                            intent.getParcelableExtra(WifiManager.EXTRA_WIFI_CONFIGURATION));

































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;