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

Only display warning to user if we are enabling OEM

Browse Source 
When we disable OEM unlocking through developer options, no need
to show the warning dialog.

bug:26285618
Change-Id: I476761aeb850a60f345fc2fd8cbdb4ec730cc2c9
This commit is contained in:
Udam Saini
2016-01-14 18:13:22 -08:00
parent 4ccc2c3537
commit 7df06f131f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1762,13 +1762,13 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
} else if (preference == mBtHciSnoopLog) { } else if (preference == mBtHciSnoopLog) {
writeBtHciSnoopLogOptions(); writeBtHciSnoopLogOptions();
} else if (preference == mEnableOemUnlock) { } 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(); confirmEnableOemUnlock();
}
} else { } else {
Utils.setOemUnlockEnabled(getActivity(), false); Utils.setOemUnlockEnabled(getActivity(), false);
} }
}
} else if (preference == mMockLocationAppPref) { } else if (preference == mMockLocationAppPref) {
Intent intent = new Intent(getActivity(), AppPicker.class); Intent intent = new Intent(getActivity(), AppPicker.class);
intent.putExtra(AppPicker.EXTRA_REQUESTIING_PERMISSION, intent.putExtra(AppPicker.EXTRA_REQUESTIING_PERMISSION,