Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev

Browse Source 
am: 4401e24add

Change-Id: Ibe8709900618cc5d9c5ca18a88ca6fce8c552d54
This commit is contained in:
Jim Miller
2016-06-08 00:38:25 +00:00
committed by android-build-merger
parent f4f7c64c75 4401e24add
commit 21c77ed1a8
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/com/android/internal/widget/LockPatternUtils.java
View File

@@ -915,23 +915,6 @@ public class LockPatternUtils {
}
}
/**
* Gets whether the device is encrypted.
*
* @return Whether the device is encrypted.
*/
public static boolean isDeviceEncrypted() {
IMountService mountService = IMountService.Stub.asInterface(
ServiceManager.getService("mount"));
try {
return mountService.getEncryptionState() != IMountService.ENCRYPTION_STATE_NONE
&& mountService.getPasswordType() != StorageManager.CRYPT_TYPE_DEFAULT;
} catch (RemoteException re) {
Log.e(TAG, "Error getting encryption state", re);
}
return true;
}
/**
* Determine if the device supports encryption, even if it's set to default. This
* differs from isDeviceEncrypted() in that it returns true even if the device is