summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2012-11-09 09:51:21 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-09 09:51:21 -0800
commit321020b7e08215b813f15caaad1c59ac215831c6 (patch)
tree522d0b6b00219957aaf0db9d15012d4396e92052 /api
parent36465c781519719a91d12bbe780db1180c06df57 (diff)
parent4717c261b2c670d5c0925e3527a864aa52db6ac0 (diff)
downloadframeworks_base-321020b7e08215b813f15caaad1c59ac215831c6.zip
frameworks_base-321020b7e08215b813f15caaad1c59ac215831c6.tar.gz
frameworks_base-321020b7e08215b813f15caaad1c59ac215831c6.tar.bz2
Merge "Remove DhcpInfoInternal"
Diffstat (limited to 'api')
-rw-r--r--api/current.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 6164410..a54a0bc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12575,7 +12575,7 @@ package android.net {
method public int getUid();
}
- public class DhcpInfo implements android.os.Parcelable {
+ public deprecated class DhcpInfo implements android.os.Parcelable {
ctor public DhcpInfo();
method public int describeContents();
method public void writeToParcel(android.os.Parcel, int);
@@ -13442,7 +13442,7 @@ package android.net.wifi {
method public boolean enableNetwork(int, boolean);
method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();
method public android.net.wifi.WifiInfo getConnectionInfo();
- method public android.net.DhcpInfo getDhcpInfo();
+ method public deprecated android.net.DhcpInfo getDhcpInfo();
method public java.util.List<android.net.wifi.ScanResult> getScanResults();
method public int getWifiState();
method public boolean isWifiEnabled();