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

Merge "Update usage of IMountService constants."

Browse Source
This commit is contained in:
Sudheer Shanka
2016-10-27 22:38:31 +00:00
committed by Android (Google) Code Review
parent 700949d8ad 1d8da1d51a
commit c52914f564
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,11 +293,11 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
try { try {
Log.d(TAG, "Validating encryption state."); Log.d(TAG, "Validating encryption state.");
state = service.getEncryptionState(); state = service.getEncryptionState();
if (state == IMountService.ENCRYPTION_STATE_NONE) { if (state == StorageManager.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.");
return true; // Unexpected, but fine, I guess... return true; // Unexpected, but fine, I guess...
} }
return state == IMountService.ENCRYPTION_STATE_OK; return state == StorageManager.ENCRYPTION_STATE_OK;
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, "Unable to get encryption state properly"); Log.w(TAG, "Unable to get encryption state properly");
return true; return true;
@@ -310,7 +310,7 @@ 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;
mCorrupt = state == IMountService.ENCRYPTION_STATE_ERROR_CORRUPT; mCorrupt = state == StorageManager.ENCRYPTION_STATE_ERROR_CORRUPT;
} else { } else {
Log.d(TAG, "Encryption state validated. Proceeding to configure UI"); Log.d(TAG, "Encryption state validated. Proceeding to configure UI");
} }