diff options
| author | Jim Miller <jaggies@google.com> | 2014-10-25 03:42:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-25 03:42:06 +0000 |
| commit | a3ff1a3fbe431c1ee4fb9f57deee7b339e1fb69c (patch) | |
| tree | e2b41bd9a54a7394795d47293bf0da5ec027feec | |
| parent | 3f9b6331d602261abad2fa74fbecfd49453ed430 (diff) | |
| parent | a30955a6634323dfc1ed2704ce0ca2f4f19d3ef3 (diff) | |
| download | packages_apps_Settings-a3ff1a3fbe431c1ee4fb9f57deee7b339e1fb69c.zip packages_apps_Settings-a3ff1a3fbe431c1ee4fb9f57deee7b339e1fb69c.tar.gz packages_apps_Settings-a3ff1a3fbe431c1ee4fb9f57deee7b339e1fb69c.tar.bz2 | |
am a30955a6: am 500ecf26: am dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev
* commit 'a30955a6634323dfc1ed2704ce0ca2f4f19d3ef3':
Minor cleanup in EncryptionInterstitial
| -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 e836aed..554f848 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 |