Move legacy full disk encryption code to Settings.

Fixes bug 27617297

Change-Id: I59455cc1fc46949348d2922834724ab40c14f886
This commit is contained in:
Jim Miller
2016-06-03 18:39:16 -07:00
parent a1984286d3
commit 525ca53b4f

View File

@@ -903,23 +903,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