Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '500ecf26d15d75fa5baa8bc98ff61792fa858857':
  Minor cleanup in EncryptionInterstitial
This commit is contained in:
Jim Miller
2014-10-25 01:20:33 +00:00
committed by Android Git Automerger
parent 56f8032a0c 500ecf26d1
commit a30955a663
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