From 59864d2ce7801251d98c8f5fc3683eab556948d8 Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Fri, 24 Oct 2014 15:41:44 -0700
Subject: [PATCH] Minor cleanup in EncryptionInterstitial

Fixes bug 18037481

Change-Id: I4e9dcc86a2d3db5c9311d5f743f03db19ca164e6
---
 src/com/android/settings/EncryptionInterstitial.java | 6 ++++--
 1 file 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
-- 
2.11.0