Fix crash when changing encrypt with credential

Bug: 27173979 Change-Id: If8ef7a9342bcb1b0602791df1dc7634b3e980ee7
2016-02-25 15:43:24 -08:00
parent b671780528
commit 77181e9478
3 changed files with 7 additions and 2 deletions
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -292,7 +292,7 @@ public class ChooseLockGeneric extends SettingsActivity {
                }
            } else if (requestCode == CHOOSE_LOCK_REQUEST
                    || requestCode == ENABLE_ENCRYPTION_REQUEST) {
-                if (resultCode != RESULT_CANCELED) {
+                if (resultCode != RESULT_CANCELED || mForChangeCredRequiredForBoot) {
                    getActivity().setResult(resultCode, data);
                    finish();
                }