From a7bc1135c270fd4a84ab7ad45b7194e9b580300e Mon Sep 17 00:00:00 2001
From: Isaac Levy <ilevy@google.com>
Date: Wed, 6 Jul 2011 13:54:48 -0700
Subject: [PATCH] Moved WifiWatchdogService and DnsPinger

- Moved WWS and DnsPinger in prep for StateMachine rewrite
 intent.

Change-Id: I912ca80d31ee2ded99eb345a2e5a55d01bd9910c
---
 .../server => core/java/android/net}/DnsPinger.java      | 2 +-
 services/java/com/android/server/WifiService.java        | 1 +
 .../java/android/net/wifi}/WifiWatchdogService.java      | 9 +++------
 3 files changed, 5 insertions(+), 7 deletions(-)
 rename {services/java/com/android/server => core/java/android/net}/DnsPinger.java (99%)
 rename {services/java/com/android/server => wifi/java/android/net/wifi}/WifiWatchdogService.java (99%)

diff --git a/services/java/com/android/server/DnsPinger.java b/core/java/android/net/DnsPinger.java
similarity index 99%
rename from services/java/com/android/server/DnsPinger.java
rename to core/java/android/net/DnsPinger.java
index 4e33938b2ca8a..f2d84ebc9889f 100644
--- a/services/java/com/android/server/DnsPinger.java
+++ b/core/java/android/net/DnsPinger.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server;
+package android.net;
 
 import android.content.Context;
 import android.net.ConnectivityManager;
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index 77258910438b0..5f0922ec4f092 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -36,6 +36,7 @@ import android.net.wifi.WifiManager;
 import android.net.wifi.WifiStateMachine;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiConfiguration.KeyMgmt;
+import android.net.wifi.WifiWatchdogService;
 import android.net.wifi.WpsConfiguration;
 import android.net.wifi.WpsResult;
 import android.net.ConnectivityManager;
diff --git a/services/java/com/android/server/WifiWatchdogService.java b/wifi/java/android/net/wifi/WifiWatchdogService.java
similarity index 99%
rename from services/java/com/android/server/WifiWatchdogService.java
rename to wifi/java/android/net/wifi/WifiWatchdogService.java
index 1356e2a9b23f6..bce4b3ad5f37b 100644
--- a/services/java/com/android/server/WifiWatchdogService.java
+++ b/wifi/java/android/net/wifi/WifiWatchdogService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server;
+package android.net.wifi;
 
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
@@ -23,12 +23,9 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.database.ContentObserver;
 import android.net.ConnectivityManager;
+import android.net.DnsPinger;
 import android.net.NetworkInfo;
 import android.net.Uri;
-import android.net.wifi.ScanResult;
-import android.net.wifi.SupplicantState;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
@@ -159,7 +156,7 @@ public class WifiWatchdogService {
         BLACKLISTED_AP
     }
 
-    WifiWatchdogService(Context context) {
+    public WifiWatchdogService(Context context) {
         mContext = context;
         mContentResolver = context.getContentResolver();
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);