Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f5860c9 authored Dec 15, 2015 by Maurice Lam Committed by Android (Google) Code Review Dec 15, 2015

Merge "[ScreenLock] Fix result code handling"

parents b69b9604 e9d2abca

src/com/android/settings/ChooseLockGeneric.java

+6 −7

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

src/com/android/settings/EncryptionInterstitial.java

+2 −3

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