commit e3fdcad6a2c4fbfb3c2f71dc3ebdd60b1584a3d1
author Quang Luong <qal@google.com> Thu Jun 06 08:33:00 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 06 08:33:00 2024 +0000
tree 2718bb3fa060213009a206b424465d9a0fb5aff2
parent 39e9aede9a4916401de206d7048ca4edafabde9f
parent dda3dd56cb0b0dccd4480e321146893e053cff15

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

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

diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index 1e40568..70e08eb 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -311,7 +311,9 @@
         mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
         if (!mHideMeteredAndPrivacy && mWifiManager.isConnectedMacRandomizationSupported()) {
             mPrivacySettingsSpinner = mView.findViewById(R.id.privacy_settings);
-            mDhcpSettingsSpinner  = mView.findViewById(R.id.dhcp_settings);
+            if (Flags.androidVWifiApi()) {
+                mDhcpSettingsSpinner = mView.findViewById(R.id.dhcp_settings);
+            }
             mView.findViewById(R.id.privacy_settings_fields).setVisibility(View.VISIBLE);
         }
         mHiddenSettingsSpinner.setOnItemSelectedListener(this);