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

Commit 654f5090 authored by Isaac Levy's avatar Isaac Levy
Browse files

WifiWatchdog rewrite to formal statemachine 

Rewrote wifiwatchdog service to use net.statemachine

Change-Id: Id6fd42b13192ac2e99f842ff50e9edff1696675d
parent a698e6a6

core/java/com/android/internal/util/Protocol.java

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ public class Protocol { 


    /** Non system protocols */

    public static final int BASE_WIFI                                               = 0x00020000;

    public static final int BASE_WIFI_WATCHDOG                                      = 0x00021000;

    public static final int BASE_DHCP                                               = 0x00030000;

    public static final int BASE_DATA_CONNECTION                                    = 0x00040000;

    public static final int BASE_DATA_CONNECTION_AC                                 = 0x00041000;

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

+7 −6
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ import android.net.wifi.WifiInfo; 
import android.net.wifi.WifiManager;

import android.net.wifi.WifiStateMachine;

import android.net.wifi.WifiConfiguration;

import android.net.wifi.WifiWatchdogStateMachine;

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;
@@ -343,7 +343,7 @@ public class WifiService extends IWifiManager.Stub { 
     * Protected by mWifiStateTracker lock.

     */

    private final WorkSource mTmpWorkSource = new WorkSource();

    private WifiWatchdogService mWifiWatchdogService;

    private WifiWatchdogStateMachine mWifiWatchdogStateMachine;



    WifiService(Context context) {

        mContext = context;
@@ -434,8 +434,9 @@ public class WifiService extends IWifiManager.Stub { 
                (wifiEnabled ? "enabled" : "disabled"));

        setWifiEnabled(wifiEnabled);



        //TODO: as part of WWS refactor, create only when needed

        mWifiWatchdogService = new WifiWatchdogService(mContext);

        mWifiWatchdogStateMachine = WifiWatchdogStateMachine.

               makeWifiWatchdogStateMachine(mContext);



    }



    private boolean testAndClearWifiSavedState() {
@@ -1162,8 +1163,8 @@ public class WifiService extends IWifiManager.Stub { 
        mLocks.dump(pw);



        pw.println();

        pw.println("WifiWatchdogService dump");

        mWifiWatchdogService.dump(pw);

        pw.println("WifiWatchdogStateMachine dump");

        mWifiWatchdogStateMachine.dump(pw);

    }



    private class WifiLock extends DeathRecipient {