diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-07-01 19:46:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-01 19:46:55 +0000 |
| commit | edc3157948c9820998ac1aca33ced3e07bc249ff (patch) | |
| tree | 0ee9c69942603160f1725cd0c6f7dbbb2615275c /api | |
| parent | 2956363244ecb61f48729d93b510ffadac591cae (diff) | |
| parent | 7226c8f95b5971af2710c8d2f8a8b6f2210e2420 (diff) | |
| download | frameworks_base-edc3157948c9820998ac1aca33ced3e07bc249ff.zip frameworks_base-edc3157948c9820998ac1aca33ced3e07bc249ff.tar.gz frameworks_base-edc3157948c9820998ac1aca33ced3e07bc249ff.tar.bz2 | |
Merge "More API review feedback" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 5 | ||||
| -rw-r--r-- | api/system-current.txt | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt index 6b65a0e..a4e1dec 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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; diff --git a/api/system-current.txt b/api/system-current.txt index b9d88bd..f1da5f2 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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; |