Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7bc1135 authored by Isaac Levy's avatar Isaac Levy
Browse files

Moved WifiWatchdogService and DnsPinger 

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

Change-Id: I912ca80d31ee2ded99eb345a2e5a55d01bd9910c
parent e58e9b8c

services/java/com/android/server/DnsPinger.java→core/java/android/net/DnsPinger.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package android.net;



import android.content.Context;

import android.net.ConnectivityManager;

services/java/com/android/server/WifiService.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

services/java/com/android/server/WifiWatchdogService.java→wifi/java/android/net/wifi/WifiWatchdogService.java

+3 −6
Original line number Diff line number Diff line
@@ -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);