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

Merge "[ScreenLock] Fix result code handling"

Browse Source
This commit is contained in:
Maurice Lam
2015-12-15 22:20:47 +00:00
committed by Android (Google) Code Review
parent b69b96042c e9d2abca86
commit 0f5860c9a0
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -248,13 +248,12 @@ public class ChooseLockGeneric extends SettingsActivity {
mPasswordConfirmed = true; mPasswordConfirmed = true;
mUserPassword = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD); mUserPassword = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
updatePreferencesOrFinish(); updatePreferencesOrFinish();
} else if (requestCode == ENABLE_ENCRYPTION_REQUEST } else if (requestCode == CHOOSE_LOCK_REQUEST
&& resultCode == Activity.RESULT_OK) { || requestCode == ENABLE_ENCRYPTION_REQUEST) {
getActivity().setResult(resultCode, data); if (resultCode != RESULT_CANCELED) {
finish(); getActivity().setResult(resultCode, data);
} else if (requestCode == CHOOSE_LOCK_REQUEST) { finish();
getActivity().setResult(resultCode, data); }
finish();
} else { } else {
getActivity().setResult(Activity.RESULT_CANCELED); getActivity().setResult(Activity.RESULT_CANCELED);
finish(); finish();

5
src/com/android/settings/EncryptionInterstitial.java
View File

@@ -170,9 +170,8 @@ public class EncryptionInterstitial extends SettingsActivity {
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if (requestCode == CHOOSE_LOCK_REQUEST && if (requestCode == CHOOSE_LOCK_REQUEST && resultCode != RESULT_CANCELED) {
resultCode == RESULT_FIRST_USER) { getActivity().setResult(resultCode, data);
getActivity().setResult(RESULT_OK, data);
finish(); finish();
} }
} }