Merge "Expose fields in WifiConfiguration." am: 1ea4180c3a

am: ce13838ade

Change-Id: Ia391a1b115646ad0409c5b52fee664d42901dd18
This commit is contained in:
Amin Shaikh
2017-01-09 23:54:30 +00:00
committed by android-build-merger
2 changed files with 14 additions and 0 deletions

View File

@@ -26849,6 +26849,8 @@ package android.net.wifi {
public class WifiConfiguration implements android.os.Parcelable { public class WifiConfiguration implements android.os.Parcelable {
ctor public WifiConfiguration(); ctor public WifiConfiguration();
method public int describeContents(); method public int describeContents();
method public boolean hasNoInternetAccess();
method public boolean isNoInternetAccessExpected();
method public boolean isPasspoint(); method public boolean isPasspoint();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public java.lang.String BSSID; field public java.lang.String BSSID;

View File

@@ -608,6 +608,7 @@ public class WifiConfiguration implements Parcelable {
* if there has been a report of it having no internet access, and, it never have had * if there has been a report of it having no internet access, and, it never have had
* internet access in the past. * internet access in the past.
*/ */
@SystemApi
public boolean hasNoInternetAccess() { public boolean hasNoInternetAccess() {
return numNoInternetAccessReports > 0 && !validatedInternetAccess; return numNoInternetAccessReports > 0 && !validatedInternetAccess;
} }
@@ -620,6 +621,17 @@ public class WifiConfiguration implements Parcelable {
*/ */
public boolean noInternetAccessExpected; public boolean noInternetAccessExpected;
/**
* The WiFi configuration is expected not to have Internet access (e.g., a wireless printer, a
* Chromecast hotspot, etc.). This will be set if the user explicitly confirms a connection to
* this configuration and selects "don't ask again".
* @hide
*/
@SystemApi
public boolean isNoInternetAccessExpected() {
return noInternetAccessExpected;
}
/** /**
* @hide * @hide
* Last time the system was connected to this configuration. * Last time the system was connected to this configuration.