commit 0f5860c9a0850843bf1279951f02f4ec13a5ebf0
author Maurice Lam <yukl@google.com> Tue Dec 15 22:20:47 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 15 22:20:47 2015 +0000
tree 2bd958e8453cad87f6d3cd8037207fa2a4055d7b
parent b69b96042cb8d02e9957297ee67ca8ed80c42409
parent e9d2abca86ef3a83fb25b9562e206e459a5b4e2b

Merge "[ScreenLock] Fix result code handling"

src/com/android/settings/ChooseLockGeneric.java

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 114637c..73f8c46 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -248,13 +248,12 @@
                 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) {
-                getActivity().setResult(resultCode, data);
-                finish();
+            } 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

diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index 5cd0508..be75c87 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -170,9 +170,8 @@
         @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();
             }
         }