diff options
| author | Jaewan Kim <jaewan@google.com> | 2014-04-07 09:01:24 +0000 |
|---|---|---|
| committer | Jaewan Kim <jaewan@google.com> | 2014-04-07 09:01:24 +0000 |
| commit | 678979748585c5903125a404e448ad6c111dedad (patch) | |
| tree | 1bbca870487778ede359e59fa26c3d1e1af94460 /core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest | |
| parent | 1284767ceb1affa6d5af77fd26ccf7322df48a6d (diff) | |
| download | frameworks_base-678979748585c5903125a404e448ad6c111dedad.zip frameworks_base-678979748585c5903125a404e448ad6c111dedad.tar.gz frameworks_base-678979748585c5903125a404e448ad6c111dedad.tar.bz2 | |
Revert "Refactor IpConfiguration from WifiConfiguration"
This reverts commit 1284767ceb1affa6d5af77fd26ccf7322df48a6d.
Change-Id: Ibccea84e5dc44c1b8954779660e0721b27f762d4
Diffstat (limited to 'core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest')
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 2ce87eb..cad030a 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 9692ec0..91c3093 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.KeyMgmt; 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.WifiManager; import android.os.Environment; import android.os.PowerManager; |