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

Merge "Only display warning to user if we are enabling OEM"

Browse Source
This commit is contained in:
Udam Saini
2016-01-19 17:24:28 +00:00
committed by Android (Google) Code Review
parent 703dae96e1 7df06f131f
commit 0db250f930
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/DevelopmentSettings.java
View File

@@ -1762,12 +1762,12 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
} else if (preference == mBtHciSnoopLog) {
writeBtHciSnoopLogOptions();
} else if (preference == mEnableOemUnlock) {
if (!showKeyguardConfirmation(getResources(), REQUEST_CODE_ENABLE_OEM_UNLOCK)) {
if (mEnableOemUnlock.isChecked()) {
if (mEnableOemUnlock.isChecked()) {
if (!showKeyguardConfirmation(getResources(), REQUEST_CODE_ENABLE_OEM_UNLOCK)) {
confirmEnableOemUnlock();
} else {
Utils.setOemUnlockEnabled(getActivity(), false);
}
} else {
Utils.setOemUnlockEnabled(getActivity(), false);
}
} else if (preference == mMockLocationAppPref) {
Intent intent = new Intent(getActivity(), AppPicker.class);