PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am dd932476: Merge "Minor cleanup in EncryptionInterstitial" into lmp-mr1-dev

Browse Source 
* commit 'dd932476b92f9d0e7ef8617d32a1d49d830b6787':
  Minor cleanup in EncryptionInterstitial
This commit is contained in:
Jim Miller
2014-10-25 01:09:05 +00:00
committed by Android Git Automerger
parent 7f40245777 dd932476b9
commit 500ecf26d1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/EncryptionInterstitial.java
View File

@@ -195,9 +195,11 @@ public class EncryptionInterstitial extends SettingsActivity {
// Updates value returned by SettingsActivity.onActivityResult(). // Updates value returned by SettingsActivity.onActivityResult().
SettingsActivity sa = (SettingsActivity)getActivity(); SettingsActivity sa = (SettingsActivity)getActivity();
Intent resultIntentData = sa.getResultIntentData(); 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); resultIntentData.putExtra(EXTRA_REQUIRE_PASSWORD, mPasswordRequired);
sa.setResultIntentData(resultIntentData);
} }
@Override @Override