PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-21 22:14:42 +00:00
committed by Android (Google) Code Review
parent c0ec917161 2df0bf9d5c
commit bbf6d04006
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog; 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.AccessPoint.AccessPointListener;
import com.android.settingslib.wifi.AccessPointPreference; import com.android.settingslib.wifi.AccessPointPreference;
import com.android.settingslib.wifi.WifiTracker; import com.android.settingslib.wifi.WifiTracker;
import com.android.settingslib.wifi.WifiTrackerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
/** /**
* Two types of UI are provided here. * Two types of UI are provided here.
* *
@@ -231,8 +232,8 @@ public class WifiSettings extends RestrictedSettingsFragment
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
mWifiTracker = mWifiTracker = WifiTrackerFactory.create(
new WifiTracker(getActivity(), this, mBgThread.getLooper(), true, true, false); getActivity(), this, mBgThread.getLooper(), true, true, false);
mWifiManager = mWifiTracker.getManager(); mWifiManager = mWifiTracker.getManager();
mConnectListener = new WifiManager.ActionListener() { mConnectListener = new WifiManager.ActionListener() {