commit dd932476b92f9d0e7ef8617d32a1d49d830b6787
author Jim Miller <jaggies@google.com> Sat Oct 25 01:01:16 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 25 01:01:17 2014 +0000
tree 79add97d23e57eacce6b82aebf4f0edd9710618d
parent ca6bc2aefad547d3ca3897b5ef8b8d5feafc7e2b
parent 59864d2ce7801251d98c8f5fc3683eab556948d8

Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev

src/com/android/settings/EncryptionInterstitial.java

diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index e836aed..554f848 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -195,9 +195,11 @@
             // 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