diff options
| author | Jim Miller <jaggies@google.com> | 2014-10-24 15:41:44 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2014-10-24 15:41:44 -0700 |
| commit | 59864d2ce7801251d98c8f5fc3683eab556948d8 (patch) | |
| tree | cf02aabc6a8707fa7a85c391afc1fb3e6d7cc419 /src/com/android/settings/EncryptionInterstitial.java | |
| parent | 52e57d2d252e585c034161173f605d773821c588 (diff) | |
| download | packages_apps_Settings-59864d2ce7801251d98c8f5fc3683eab556948d8.tar.gz packages_apps_Settings-59864d2ce7801251d98c8f5fc3683eab556948d8.tar.bz2 packages_apps_Settings-59864d2ce7801251d98c8f5fc3683eab556948d8.zip | |
Minor cleanup in EncryptionInterstitial
Fixes bug 18037481
Change-Id: I4e9dcc86a2d3db5c9311d5f743f03db19ca164e6
Diffstat (limited to 'src/com/android/settings/EncryptionInterstitial.java')
| -rw-r--r-- | src/com/android/settings/EncryptionInterstitial.java | 6 |
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 |