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

Store cooldown state through rotation

Browse Source 
Bug:24361606
Change-Id: Ifc732ce7d157aaa9a21aaedb9e64bca9ae4a56c4
This commit is contained in:
Paul Lawrence
2015-11-24 12:42:09 -08:00
parent 590151c2dc
commit 278410435a
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/CryptKeeper.java
View File

@@ -107,6 +107,8 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
private static final String FORCE_VIEW_ERROR = "error"; private static final String FORCE_VIEW_ERROR = "error";
private static final String FORCE_VIEW_PASSWORD = "password"; private static final String FORCE_VIEW_PASSWORD = "password";
private static final String STATE_COOLDOWN = "cooldown";
/** When encryption is detected, this flag indicates whether or not we've checked for errors. */ /** When encryption is detected, this flag indicates whether or not we've checked for errors. */
private boolean mValidationComplete; private boolean mValidationComplete;
private boolean mValidationRequested; private boolean mValidationRequested;
@@ -426,6 +428,10 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
mStatusBar = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE); mStatusBar = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE);
mStatusBar.disable(sWidgetsToDisable); mStatusBar.disable(sWidgetsToDisable);
if (savedInstanceState != null) {
mCooldown = savedInstanceState.getBoolean(STATE_COOLDOWN);
}
setAirplaneModeIfNecessary(); setAirplaneModeIfNecessary();
mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
// Check for (and recover) retained instance data // Check for (and recover) retained instance data
@@ -437,6 +443,11 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
} }
} }
@Override
public void onSaveInstanceState(Bundle savedInstanceState) {
savedInstanceState.putBoolean(STATE_COOLDOWN, mCooldown);
}
/** /**
* Note, we defer the state check and screen setup to onStart() because this will be * Note, we defer the state check and screen setup to onStart() because this will be
* re-run if the user clicks the power button (sleeping/waking the screen), and this is * re-run if the user clicks the power button (sleeping/waking the screen), and this is