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

Minor cleanup in EncryptionInterstitial

Browse Source 
Fixes bug 18037481

Change-Id: I4e9dcc86a2d3db5c9311d5f743f03db19ca164e6
This commit is contained in:
Jim Miller
2014-10-24 15:41:44 -07:00
parent 52e57d2d25
commit 59864d2ce7
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) {