Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data"

Browse Source 
am: 44ef19d131

Change-Id: I65b22e41ae62172cc7b241fe68c6d1c92c782a69
This commit is contained in:
Peter Qiu
2017-03-23 23:00:06 +00:00
committed by android-build-merger
parent 2aee612c14 44ef19d131
commit aadbb2d45e
7 changed files with 20 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api/current.txt
View File

@@ -24809,16 +24809,6 @@ 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();
@@ -25067,7 +25057,8 @@ package android.net.wifi {
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_FILENAME = "android.net.wifi.extra.FILENAME";
field public static final java.lang.String EXTRA_ICON = "android.net.wifi.extra.ICON";
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";

13
api/system-current.txt
View File

@@ -26961,16 +26961,6 @@ 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);
@@ -27465,7 +27455,8 @@ package android.net.wifi {
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_FILENAME = "android.net.wifi.extra.FILENAME";
field public static final java.lang.String EXTRA_ICON = "android.net.wifi.extra.ICON";
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";

13
api/test-current.txt
View File

@@ -24883,16 +24883,6 @@ 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();
@@ -25141,7 +25131,8 @@ package android.net.wifi {
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_FILENAME = "android.net.wifi.extra.FILENAME";
field public static final java.lang.String EXTRA_ICON = "android.net.wifi.extra.ICON";
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";