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

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

Browse Source
This commit is contained in:
Jim Miller
2014-10-25 01:01:16 +00:00
committed by Android (Google) Code Review
parent ca6bc2aefa 59864d2ce7
commit dd932476b9
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,10 +195,12 @@ 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.putExtra(EXTRA_REQUIRE_PASSWORD, mPasswordRequired); resultIntentData = new Intent();
sa.setResultIntentData(resultIntentData); sa.setResultIntentData(resultIntentData);
} }
resultIntentData.putExtra(EXTRA_REQUIRE_PASSWORD, mPasswordRequired);
}
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {