From 278410435ab39c77b496bf1ecf14c1703ec6c41e Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Tue, 24 Nov 2015 12:42:09 -0800 Subject: [PATCH] Store cooldown state through rotation Bug:24361606 Change-Id: Ifc732ce7d157aaa9a21aaedb9e64bca9ae4a56c4 --- src/com/android/settings/CryptKeeper.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index 90ea622a6bd..1b370661314 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -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_PASSWORD = "password"; + private static final String STATE_COOLDOWN = "cooldown"; + /** When encryption is detected, this flag indicates whether or not we've checked for errors. */ private boolean mValidationComplete; private boolean mValidationRequested; @@ -426,6 +428,10 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList mStatusBar = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE); mStatusBar.disable(sWidgetsToDisable); + if (savedInstanceState != null) { + mCooldown = savedInstanceState.getBoolean(STATE_COOLDOWN); + } + setAirplaneModeIfNecessary(); mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); // 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 * re-run if the user clicks the power button (sleeping/waking the screen), and this is