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

am edc31579: Merge "More API review feedback" into mnc-dev

Browse Source 
* commit 'edc3157948c9820998ac1aca33ced3e07bc249ff':
  More API review feedback
This commit is contained in:
Vinit Deshpande
2015-07-02 00:37:52 +00:00
committed by Android Git Automerger
parent 56ef372f5d edc3157948
commit 0ed62962d9
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/current.txt
View File

@@ -19071,14 +19071,11 @@ package android.net.wifi {
field public static final int CHANNEL_WIDTH_40MHZ = 1; // 0x1
field public static final int CHANNEL_WIDTH_80MHZ = 2; // 0x2
field public static final int CHANNEL_WIDTH_80MHZ_PLUS_MHZ = 4; // 0x4
field public static final long FLAG_80211mc_RESPONDER = 2L; // 0x2L
field public static final long FLAG_PASSPOINT_NETWORK = 1L; // 0x1L
field public java.lang.String SSID;
field public java.lang.String capabilities;
field public int centerFreq0;
field public int centerFreq1;
field public int channelWidth;
field public long flags;
field public int frequency;
field public int level;
field public java.lang.CharSequence operatorFriendlyName;
@@ -19126,7 +19123,7 @@ package android.net.wifi {
field public java.lang.String preSharedKey;
field public int priority;
field public java.lang.String providerFriendlyName;
field public java.lang.Long[] roamingConsortiumIds;
field public long[] roamingConsortiumIds;
field public int status;
field public java.lang.String[] wepKeys;
field public int wepTxKeyIndex;

5
api/system-current.txt
View File

@@ -20827,14 +20827,11 @@ package android.net.wifi {
field public static final int CHANNEL_WIDTH_40MHZ = 1; // 0x1
field public static final int CHANNEL_WIDTH_80MHZ = 2; // 0x2
field public static final int CHANNEL_WIDTH_80MHZ_PLUS_MHZ = 4; // 0x4
field public static final long FLAG_80211mc_RESPONDER = 2L; // 0x2L
field public static final long FLAG_PASSPOINT_NETWORK = 1L; // 0x1L
field public java.lang.String SSID;
field public java.lang.String capabilities;
field public int centerFreq0;
field public int centerFreq1;
field public int channelWidth;
field public long flags;
field public int frequency;
field public int level;
field public java.lang.CharSequence operatorFriendlyName;
@@ -20889,7 +20886,7 @@ package android.net.wifi {
field public java.lang.String preSharedKey;
field public int priority;
field public java.lang.String providerFriendlyName;
field public java.lang.Long[] roamingConsortiumIds;
field public long[] roamingConsortiumIds;
field public int status;
field public java.lang.String[] wepKeys;
field public int wepTxKeyIndex;

4
wifi/java/android/net/wifi/ScanResult.java
View File

@@ -216,11 +216,15 @@ public class ScanResult implements Parcelable {
*/
public int distanceSdCm;
/** {@hide} */
public static final long FLAG_PASSPOINT_NETWORK = 0x0000000000000001;
/** {@hide} */
public static final long FLAG_80211mc_RESPONDER = 0x0000000000000002;
/**
* Defines flags; such as {@link #FLAG_PASSPOINT_NETWORK}.
* {@hide}
*/
public long flags;

8
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -352,7 +352,7 @@ public class WifiConfiguration implements Parcelable {
* Roaming Consortium Id list for passpoint credential; identifies a set of networks where
* passpoint credential will be considered valid
*/
public Long[] roamingConsortiumIds;
public long[] roamingConsortiumIds;
/**
* @hide
@@ -907,7 +907,7 @@ public class WifiConfiguration implements Parcelable {
SSID = null;
BSSID = null;
FQDN = null;
roamingConsortiumIds = new Long[0];
roamingConsortiumIds = new long[0];
priority = 0;
hiddenSSID = false;
disableReason = DISABLED_UNKNOWN_REASON;
@@ -1544,7 +1544,7 @@ public class WifiConfiguration implements Parcelable {
dest.writeString(FQDN);
dest.writeString(providerFriendlyName);
dest.writeInt(roamingConsortiumIds.length);
for (Long roamingConsortiumId : roamingConsortiumIds) {
for (long roamingConsortiumId : roamingConsortiumIds) {
dest.writeLong(roamingConsortiumId);
}
dest.writeString(preSharedKey);
@@ -1619,7 +1619,7 @@ public class WifiConfiguration implements Parcelable {
config.FQDN = in.readString();
config.providerFriendlyName = in.readString();
int numRoamingConsortiumIds = in.readInt();
config.roamingConsortiumIds = new Long[numRoamingConsortiumIds];
config.roamingConsortiumIds = new long[numRoamingConsortiumIds];
for (int i = 0; i < numRoamingConsortiumIds; i++) {
config.roamingConsortiumIds[i] = in.readLong();
}