1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index e836aeded5..554f848240 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -195,9 +195,11 @@ public class EncryptionInterstitial extends SettingsActivity {
             // Updates value returned by SettingsActivity.onActivityResult().
             SettingsActivity sa = (SettingsActivity)getActivity();
             Intent resultIntentData = sa.getResultIntentData();
-            resultIntentData = resultIntentData == null ? new Intent() : resultIntentData;
+            if (resultIntentData == null) {
+                resultIntentData = new Intent();
+                sa.setResultIntentData(resultIntentData);
+            }
             resultIntentData.putExtra(EXTRA_REQUIRE_PASSWORD, mPasswordRequired);
-            sa.setResultIntentData(resultIntentData);
         }
 
         @Override