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

Commit bbf6d040 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Create a way to inject a WifiTracker into WifiSettings."

parents c0ec9171 2df0bf9d

src/com/android/settings/wifi/WifiSettings.java

+5 −4
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.wifi;



import static android.os.UserManager.DISALLOW_CONFIG_WIFI;



import android.annotation.NonNull;

import android.app.Activity;

import android.app.Dialog;
@@ -70,12 +72,11 @@ import com.android.settingslib.wifi.AccessPoint; 
import com.android.settingslib.wifi.AccessPoint.AccessPointListener;

import com.android.settingslib.wifi.AccessPointPreference;

import com.android.settingslib.wifi.WifiTracker;

import com.android.settingslib.wifi.WifiTrackerFactory;



import java.util.ArrayList;

import java.util.List;



import static android.os.UserManager.DISALLOW_CONFIG_WIFI;



/**

 * Two types of UI are provided here.

 *
@@ -231,8 +232,8 @@ public class WifiSettings extends RestrictedSettingsFragment 
    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);



        mWifiTracker =

                new WifiTracker(getActivity(), this, mBgThread.getLooper(), true, true, false);

        mWifiTracker = WifiTrackerFactory.create(

                getActivity(), this, mBgThread.getLooper(), true, true, false);

        mWifiManager = mWifiTracker.getManager();



        mConnectListener = new WifiManager.ActionListener() {