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

am 50207f04: am 3e732ab2: am e1970346: am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev

Browse Source 
* commit '50207f043f8fd2e39173956c9b4ee52fe775e115':
  Use the correct method to check if device is encrypted
This commit is contained in:
Amith Yamasani
2014-10-17 21:28:28 +00:00
committed by Android Git Automerger
parent 0b85f514c7 50207f043f
commit 7ed3951b9b
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -728,12 +728,9 @@ public class LockPatternUtils {
/** Update the encryption password if it is enabled **/
private void updateEncryptionPassword(final int type, final String password) {
DevicePolicyManager dpm = getDevicePolicyManager();
if (dpm.getStorageEncryptionStatus(getCurrentOrCallingUserId())
!= DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE) {
if (!isDeviceEncryptionEnabled()) {
return;
}
final IBinder service = ServiceManager.getService("mount");
if (service == null) {
Log.e(TAG, "Could not find the mount service to update the encryption password");