Merge "Show dialog when user tries to edit a locked down WiFi config"

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

@@ -156,8 +156,13 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
                     mAccessPointSavedState = null;
                 }
                 mSelectedAccessPoint = mDlgAccessPoint;
+
+                // Hide forget button if config editing is locked down
+                final boolean hideForgetButton = WifiSettings.isCreatorDeviceOwner(getActivity(),
+                        mDlgAccessPoint.getConfig());
                 mDialog = new WifiDialog(getActivity(), this, mDlgAccessPoint,
-                        false /* not editting */, true /* hide the submit button */);
+                        false /* not editting */, true /* hide the submit button */,
+                        hideForgetButton);
                 return mDialog;
 
         }