diff options
| author | Jaewan Kim <jaewan@google.com> | 2014-03-10 17:10:51 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2014-05-20 15:24:10 -0700 |
| commit | 6346155c5a48495944041e65ec279c88b0fa1391 (patch) | |
| tree | b0352928a2f335c3c66fa754cca2cfdd3fd1a304 /core/tests | |
| parent | 3fff22173c7010467ce9e134e89b367e311d122b (diff) | |
| download | frameworks_base-6346155c5a48495944041e65ec279c88b0fa1391.zip frameworks_base-6346155c5a48495944041e65ec279c88b0fa1391.tar.gz frameworks_base-6346155c5a48495944041e65ec279c88b0fa1391.tar.bz2 | |
Move IP config from WifiConfiguration to IpConfiguration.
This is so that Ethernet can use it in the future.
Bug: 7606609
Bug: 8687763
Change-Id: I5d1189682b13f1088848809604690648d8d9ecca
Diffstat (limited to 'core/tests')
2 files changed, 8 insertions, 8 deletions
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java index cad030a..2ce87eb 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java @@ -23,15 +23,15 @@ import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; +import android.net.IpConfiguration.IpAssignment; +import android.net.IpConfiguration.ProxySettings; +import android.net.LinkAddress; +import android.net.LinkProperties; +import android.net.RouteInfo; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration.AuthAlgorithm; -import android.net.wifi.WifiConfiguration.IpAssignment; import android.net.wifi.WifiConfiguration.KeyMgmt; -import android.net.wifi.WifiConfiguration.ProxySettings; import android.net.wifi.WifiEnterpriseConfig; -import android.net.LinkAddress; -import android.net.LinkProperties; -import android.net.RouteInfo; import java.io.InputStream; import java.net.InetAddress; diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java index 91c3093..9692ec0 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java @@ -18,12 +18,12 @@ package com.android.connectivitymanagertest.stress; import android.content.Context; import android.net.ConnectivityManager; +import android.net.IpConfiguration.IpAssignment; +import android.net.IpConfiguration.ProxySettings; import android.net.NetworkInfo.State; import android.net.wifi.ScanResult; -import android.net.wifi.WifiConfiguration; -import android.net.wifi.WifiConfiguration.IpAssignment; import android.net.wifi.WifiConfiguration.KeyMgmt; -import android.net.wifi.WifiConfiguration.ProxySettings; +import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Environment; import android.os.PowerManager; |