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

Merge "Fix broken settings tests(Round 2)"

Browse Source
This commit is contained in:
Lei Yu
2019-03-26 20:38:22 +00:00
committed by Android (Google) Code Review
parent dec5aff009 6aeed0eaa1
commit 5b39ec5d63
9 changed files with 16 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/wifi/details/AddDevicePreferenceController.java
View File

@@ -41,13 +41,18 @@ public class AddDevicePreferenceController extends BasePreferenceController {
private AccessPoint mAccessPoint;
private WifiManager mWifiManager;
public AddDevicePreferenceController(Context context, AccessPoint accessPoint) {
public AddDevicePreferenceController(Context context) {
super(context, KEY_ADD_DEVICE_CATEGORY);
mAccessPoint = accessPoint;
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
}
public AddDevicePreferenceController init(AccessPoint accessPoint) {
mAccessPoint = accessPoint;
return this;
}
@Override
public int getAvailabilityStatus() {
if (WifiDppUtils.isSupportConfiguratorQrCodeScanner(mContext, mAccessPoint)) {

2
src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
View File

@@ -134,7 +134,7 @@ public class WifiNetworkDetailsFragment extends DashboardFragment {
mMetricsFeatureProvider);
controllers.add(mWifiDetailPreferenceController);
controllers.add(new AddDevicePreferenceController(context, mAccessPoint));
controllers.add(new AddDevicePreferenceController(context).init(mAccessPoint));
controllers.add(new WifiMeteredPreferenceController(context, mAccessPoint.getConfig()));
WifiPrivacyPreferenceController privacyController = new WifiPrivacyPreferenceController(
context);