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

Merge "Don't try to talk to vold mid-encryption."

Browse Source
This commit is contained in:
Ben Komalo
2011-09-12 15:28:23 -07:00
committed by Android (Google) Code Review
parent 31b562cede d4758efef6
commit 3fe9b9c948
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,6 +88,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
/** When encryption is detected, this flag indivates whether or not we've checked for erros. */ /** When encryption is detected, this flag indivates whether or not we've checked for erros. */
private boolean mValidationComplete; private boolean mValidationComplete;
private boolean mValidationRequested;
/** A flag to indicate that the volume is in a bad state (e.g. partially encrypted). */ /** A flag to indicate that the volume is in a bad state (e.g. partially encrypted). */
private boolean mEncryptionGoneBad; private boolean mEncryptionGoneBad;
@@ -159,6 +160,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
protected Boolean doInBackground(Void... params) { protected Boolean doInBackground(Void... params) {
IMountService service = getMountService(); IMountService service = getMountService();
try { try {
Log.d(TAG, "Validating encryption state.");
int state = service.getEncryptionState(); int state = service.getEncryptionState();
if (state == IMountService.ENCRYPTION_STATE_NONE) { if (state == IMountService.ENCRYPTION_STATE_NONE) {
Log.w(TAG, "Unexpectedly in CryptKeeper even though there is no encryption."); Log.w(TAG, "Unexpectedly in CryptKeeper even though there is no encryption.");
@@ -177,6 +179,8 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
if (Boolean.FALSE.equals(result)) { if (Boolean.FALSE.equals(result)) {
Log.w(TAG, "Incomplete, or corrupted encryption detected. Prompting user to wipe."); Log.w(TAG, "Incomplete, or corrupted encryption detected. Prompting user to wipe.");
mEncryptionGoneBad = true; mEncryptionGoneBad = true;
} else {
Log.d(TAG, "Encryption state validated. Proceeding to configure UI");
} }
setupUi(); setupUi();
} }
@@ -237,9 +241,6 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
mWakeLock = retained.wakelock; mWakeLock = retained.wakelock;
Log.d(TAG, "Restoring wakelock from NonConfigurationInstanceState"); Log.d(TAG, "Restoring wakelock from NonConfigurationInstanceState");
} }
// Check the encryption status to ensure something hasn't gone bad.
new ValidationTask().execute((Void[]) null);
} }
/** /**
@@ -251,10 +252,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
// Check to see why we were started. setupUi();
if (mValidationComplete) {
setupUi();
}
} }
/** /**
@@ -272,9 +270,13 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
if (!"".equals(progress) || isDebugView(FORCE_VIEW_PROGRESS)) { if (!"".equals(progress) || isDebugView(FORCE_VIEW_PROGRESS)) {
setContentView(R.layout.crypt_keeper_progress); setContentView(R.layout.crypt_keeper_progress);
encryptionProgressInit(); encryptionProgressInit();
} else { } else if (mValidationComplete) {
setContentView(R.layout.crypt_keeper_password_entry); setContentView(R.layout.crypt_keeper_password_entry);
passwordEntryInit(); passwordEntryInit();
} else if (!mValidationRequested) {
// We're supposed to be encrypted, but no validation has been done.
new ValidationTask().execute((Void[]) null);
mValidationRequested = true;
} }
} }