diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2014-08-19 19:49:10 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-19 19:49:10 +0000 |
commit | aa740d3fdcf2fb67d6051fee1e72b87f7ca249a6 (patch) | |
tree | beb3d576a573510ba56649f0affc231834120f1c /wifi | |
parent | 2bfdd6bc5bf627c259090c62aa8460ea1285f4c2 (diff) | |
parent | 56d4c18e2f5f4780b900f30c3f8cc52a25714d54 (diff) | |
download | frameworks_base-aa740d3fdcf2fb67d6051fee1e72b87f7ca249a6.zip frameworks_base-aa740d3fdcf2fb67d6051fee1e72b87f7ca249a6.tar.gz frameworks_base-aa740d3fdcf2fb67d6051fee1e72b87f7ca249a6.tar.bz2 |
am 5eb792fc: am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev
* commit '5eb792fcdebc92a872c17a54310db3de60e7d620':
Stop using LinkProperties for static configuration.
Diffstat (limited to 'wifi')
-rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 3c37b94..ac2a176 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -21,7 +21,7 @@ import android.net.IpConfiguration; import android.net.IpConfiguration.ProxySettings; import android.net.IpConfiguration.IpAssignment; import android.net.ProxyInfo; -import android.net.LinkProperties; +import android.net.StaticIpConfiguration; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -1096,13 +1096,13 @@ public class WifiConfiguration implements Parcelable { } /** @hide */ - public LinkProperties getLinkProperties() { - return mIpConfiguration.linkProperties; + public StaticIpConfiguration getStaticIpConfiguration() { + return mIpConfiguration.getStaticIpConfiguration(); } /** @hide */ - public void setLinkProperties(LinkProperties linkProperties) { - mIpConfiguration.linkProperties = linkProperties; + public void setStaticIpConfiguration(StaticIpConfiguration staticIpConfiguration) { + mIpConfiguration.setStaticIpConfiguration(staticIpConfiguration); } /** @hide */ @@ -1126,9 +1126,19 @@ public class WifiConfiguration implements Parcelable { } /** @hide */ + public ProxyInfo getHttpProxy() { + return mIpConfiguration.httpProxy; + } + + /** @hide */ + public void setHttpProxy(ProxyInfo httpProxy) { + mIpConfiguration.httpProxy = httpProxy; + } + + /** @hide */ public void setProxy(ProxySettings settings, ProxyInfo proxy) { mIpConfiguration.proxySettings = settings; - mIpConfiguration.linkProperties.setHttpProxy(proxy); + mIpConfiguration.httpProxy = proxy; } /** Implement the Parcelable interface {@hide} */ |