Merge "Gate dhcp hostname setting behind Wifi V API flag" into main

This commit is contained in:
Quang Luong
2024-06-06 08:33:00 +00:00
committed by Android (Google) Code Review

View File

@@ -311,7 +311,9 @@ public class WifiConfigController2 implements TextWatcher,
mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings); mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
if (!mHideMeteredAndPrivacy && mWifiManager.isConnectedMacRandomizationSupported()) { if (!mHideMeteredAndPrivacy && mWifiManager.isConnectedMacRandomizationSupported()) {
mPrivacySettingsSpinner = mView.findViewById(R.id.privacy_settings); mPrivacySettingsSpinner = mView.findViewById(R.id.privacy_settings);
if (Flags.androidVWifiApi()) {
mDhcpSettingsSpinner = mView.findViewById(R.id.dhcp_settings); mDhcpSettingsSpinner = mView.findViewById(R.id.dhcp_settings);
}
mView.findViewById(R.id.privacy_settings_fields).setVisibility(View.VISIBLE); mView.findViewById(R.id.privacy_settings_fields).setVisibility(View.VISIBLE);
} }
mHiddenSettingsSpinner.setOnItemSelectedListener(this); mHiddenSettingsSpinner.setOnItemSelectedListener(this);