Loading src/com/android/settings/DevelopmentSettings.java +4 −6 Original line number Diff line number Diff line Loading @@ -53,11 +53,11 @@ import android.os.ServiceManager; import android.os.StrictMode; import android.os.SystemProperties; import android.os.UserHandle; import android.service.persistentdata.PersistentDataBlockManager; import android.os.UserManager; import android.os.storage.IMountService; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.persistentdata.PersistentDataBlockManager; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.ListPreference; import android.support.v7.preference.Preference; Loading @@ -67,9 +67,9 @@ import android.support.v7.preference.PreferenceScreen; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; import android.view.ThreadedRenderer; import android.view.IWindowManager; import android.view.LayoutInflater; import android.view.ThreadedRenderer; import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityManager; Loading Loading @@ -684,10 +684,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0); updateSwitchPreference(mBtHciSnoopLog, Settings.Secure.getInt(cr, Settings.Secure.BLUETOOTH_HCI_LOG, 0) != 0); if (mEnableOemUnlock != null) { updateSwitchPreference(mEnableOemUnlock, Utils.isOemUnlockEnabled(getActivity())); updateOemUnlockSettingDescription(); } updateSwitchPreference(mDebugViewAttributes, Settings.Global.getInt(cr, Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0); updateSwitchPreference(mForceAllowOnExternal, Settings.Global.getInt(cr, Loading Loading @@ -1039,6 +1035,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment private void updateOemUnlockOptions() { if (mEnableOemUnlock != null) { updateSwitchPreference(mEnableOemUnlock, isBootloaderUnlocked()); updateOemUnlockSettingDescription(); // Showing mEnableOemUnlock preference as device has persistent data block. mEnableOemUnlock.setDisabledByAdmin(null); mEnableOemUnlock.setEnabled(enableOemUnlockPreference()); Loading Loading
src/com/android/settings/DevelopmentSettings.java +4 −6 Original line number Diff line number Diff line Loading @@ -53,11 +53,11 @@ import android.os.ServiceManager; import android.os.StrictMode; import android.os.SystemProperties; import android.os.UserHandle; import android.service.persistentdata.PersistentDataBlockManager; import android.os.UserManager; import android.os.storage.IMountService; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.persistentdata.PersistentDataBlockManager; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.ListPreference; import android.support.v7.preference.Preference; Loading @@ -67,9 +67,9 @@ import android.support.v7.preference.PreferenceScreen; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; import android.view.ThreadedRenderer; import android.view.IWindowManager; import android.view.LayoutInflater; import android.view.ThreadedRenderer; import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityManager; Loading Loading @@ -684,10 +684,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0); updateSwitchPreference(mBtHciSnoopLog, Settings.Secure.getInt(cr, Settings.Secure.BLUETOOTH_HCI_LOG, 0) != 0); if (mEnableOemUnlock != null) { updateSwitchPreference(mEnableOemUnlock, Utils.isOemUnlockEnabled(getActivity())); updateOemUnlockSettingDescription(); } updateSwitchPreference(mDebugViewAttributes, Settings.Global.getInt(cr, Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0); updateSwitchPreference(mForceAllowOnExternal, Settings.Global.getInt(cr, Loading Loading @@ -1039,6 +1035,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment private void updateOemUnlockOptions() { if (mEnableOemUnlock != null) { updateSwitchPreference(mEnableOemUnlock, isBootloaderUnlocked()); updateOemUnlockSettingDescription(); // Showing mEnableOemUnlock preference as device has persistent data block. mEnableOemUnlock.setDisabledByAdmin(null); mEnableOemUnlock.setEnabled(enableOemUnlockPreference()); Loading