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

Merge "Reflect Wifi config lockdown restriction in Settings" into mnc-dev

Browse Source
This commit is contained in:
Zoltan Szatmary-Ban
2015-05-15 20:22:34 +00:00
committed by Android (Google) Code Review
parent 0c0e35ef30 1a2aa9942f
commit cb5444ad2c
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
View File

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