Stop leaking wakelocks in cryptkeeper.
Also add in logging for certain events, as well as progress update to
help hunt down a stuck-in-progress bug
Bug: 5163155
Change-Id: I2e01a56b012f41f178beba0becfbe8173a1715ee
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 297288b..0552b68 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -235,6 +235,7 @@
if (lastInstance instanceof NonConfigurationInstanceState) {
NonConfigurationInstanceState retained = (NonConfigurationInstanceState) lastInstance;
mWakeLock = retained.wakelock;
+ Log.d(TAG, "Restoring wakelock from NonConfigurationInstanceState");
}
}
@@ -276,6 +277,7 @@
@Override
public Object onRetainNonConfigurationInstance() {
NonConfigurationInstanceState state = new NonConfigurationInstanceState(mWakeLock);
+ Log.d(TAG, "Handing wakelock off to NonConfigurationInstanceState");
mWakeLock = null;
return state;
}
@@ -285,6 +287,7 @@
super.onDestroy();
if (mWakeLock != null) {
+ Log.d(TAG, "Releasing and destroying wakelock");
mWakeLock.release();
mWakeLock = null;
}
@@ -295,10 +298,13 @@
// we never release this wakelock as we will be restarted after the device
// is encrypted.
- PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
- mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK, TAG);
-
- mWakeLock.acquire();
+ Log.d(TAG, "Encryption progress screen initializing.");
+ if (mWakeLock != null) {
+ Log.d(TAG, "Acquiring wakelock.");
+ PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+ mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK, TAG);
+ mWakeLock.acquire();
+ }
ProgressBar progressBar = (ProgressBar) findViewById(R.id.progress_bar);
progressBar.setIndeterminate(true);
@@ -349,6 +355,7 @@
}
CharSequence status = getText(R.string.crypt_keeper_setup_description);
+ Log.v(TAG, "Encryption progress: " + progress);
TextView tv = (TextView) findViewById(R.id.status);
tv.setText(TextUtils.expandTemplate(status, Integer.toString(progress)));
@@ -418,6 +425,7 @@
// cooldown period.
mPasswordEntry.setEnabled(false);
+ Log.d(TAG, "Attempting to send command to decrypt");
new DecryptTask().execute(password);
return true;