Use StorageManager.isFileEncrypted() instead of deprecated methods
Since emulated FBE is no longer supported, isFileEncryptedNativeOnly() and isFileEncryptedNativeOrEmulated() are the same as the new method isFileEncrypted(). Replace all calls to these deprecated methods in this repository with isFileEncrypted(). Bug: 232458753 Change-Id: I95beea86ef771396c2e08f2d6a643fdc629ad89f
This commit is contained in:
@@ -247,7 +247,7 @@ public class SetupFingerprintEnrollIntroductionTest {
|
||||
@Test
|
||||
@Ignore
|
||||
public void testLockPattern() {
|
||||
ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
|
||||
ShadowStorageManager.setIsFileEncrypted(false);
|
||||
|
||||
mController.create().postCreate(null).resume();
|
||||
|
||||
|
@@ -146,7 +146,7 @@ public class ChooseLockGenericTest {
|
||||
|
||||
@Test
|
||||
public void updatePreferencesOrFinish_passwordTypeSetPinNotFbe_shouldNotStartChooseLock() {
|
||||
ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
|
||||
ShadowStorageManager.setIsFileEncrypted(false);
|
||||
Intent intent = new Intent().putExtra(
|
||||
LockPatternUtils.PASSWORD_TYPE_KEY,
|
||||
DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
|
||||
@@ -159,7 +159,7 @@ public class ChooseLockGenericTest {
|
||||
|
||||
@Test
|
||||
public void updatePreferencesOrFinish_footerPreferenceAddedHighComplexityText() {
|
||||
ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
|
||||
ShadowStorageManager.setIsFileEncrypted(false);
|
||||
Intent intent = new Intent()
|
||||
.putExtra(EXTRA_KEY_CALLER_APP_NAME, "app name")
|
||||
.putExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY, PASSWORD_COMPLEXITY_HIGH);
|
||||
@@ -175,7 +175,7 @@ public class ChooseLockGenericTest {
|
||||
|
||||
@Test
|
||||
public void updatePreferencesOrFinish_footerPreferenceAddedMediumComplexityText() {
|
||||
ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
|
||||
ShadowStorageManager.setIsFileEncrypted(false);
|
||||
Intent intent = new Intent()
|
||||
.putExtra(EXTRA_KEY_CALLER_APP_NAME, "app name")
|
||||
.putExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY, PASSWORD_COMPLEXITY_MEDIUM);
|
||||
@@ -191,7 +191,7 @@ public class ChooseLockGenericTest {
|
||||
|
||||
@Test
|
||||
public void updatePreferencesOrFinish_footerPreferenceAddedLowComplexityText() {
|
||||
ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
|
||||
ShadowStorageManager.setIsFileEncrypted(false);
|
||||
Intent intent = new Intent()
|
||||
.putExtra(EXTRA_KEY_CALLER_APP_NAME, "app name")
|
||||
.putExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY, PASSWORD_COMPLEXITY_LOW);
|
||||
@@ -207,7 +207,7 @@ public class ChooseLockGenericTest {
|
||||
|
||||
@Test
|
||||
public void updatePreferencesOrFinish_footerPreferenceAddedNoneComplexityText() {
|
||||
ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
|
||||
ShadowStorageManager.setIsFileEncrypted(false);
|
||||
Intent intent = new Intent()
|
||||
.putExtra(EXTRA_KEY_CALLER_APP_NAME, "app name")
|
||||
.putExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY, PASSWORD_COMPLEXITY_NONE);
|
||||
@@ -389,7 +389,7 @@ public class ChooseLockGenericTest {
|
||||
|
||||
@Test
|
||||
public void updatePreferencesOrFinish_ComplexityIsReadFromDPM() {
|
||||
ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
|
||||
ShadowStorageManager.setIsFileEncrypted(false);
|
||||
ShadowLockPatternUtils.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_HIGH);
|
||||
|
||||
initActivity(null);
|
||||
@@ -405,7 +405,7 @@ public class ChooseLockGenericTest {
|
||||
|
||||
@Test
|
||||
public void updatePreferencesOrFinish_ComplexityIsMergedWithDPM() {
|
||||
ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
|
||||
ShadowStorageManager.setIsFileEncrypted(false);
|
||||
ShadowLockPatternUtils.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_HIGH);
|
||||
Intent intent = new Intent()
|
||||
.putExtra(EXTRA_KEY_CALLER_APP_NAME, "app name")
|
||||
@@ -425,7 +425,7 @@ public class ChooseLockGenericTest {
|
||||
|
||||
@Test
|
||||
public void updatePreferencesOrFinish_ComplexityIsMergedWithDPM_AppIsHigher() {
|
||||
ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
|
||||
ShadowStorageManager.setIsFileEncrypted(false);
|
||||
ShadowLockPatternUtils.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_LOW);
|
||||
Intent intent = new Intent()
|
||||
.putExtra(EXTRA_KEY_CALLER_APP_NAME, "app name")
|
||||
|
@@ -30,7 +30,7 @@ public class ShadowStorageManager {
|
||||
|
||||
private static boolean sIsUnmountCalled;
|
||||
private static boolean sIsForgetCalled;
|
||||
private static boolean sIsFileEncryptedNativeOrEmulated = true;
|
||||
private static boolean sIsFileEncrypted = true;
|
||||
|
||||
public static boolean isUnmountCalled() {
|
||||
return sIsUnmountCalled;
|
||||
@@ -44,7 +44,7 @@ public class ShadowStorageManager {
|
||||
public static void reset() {
|
||||
sIsUnmountCalled = false;
|
||||
sIsForgetCalled = false;
|
||||
sIsFileEncryptedNativeOrEmulated = true;
|
||||
sIsFileEncrypted = true;
|
||||
}
|
||||
|
||||
@Implementation
|
||||
@@ -73,12 +73,12 @@ public class ShadowStorageManager {
|
||||
}
|
||||
|
||||
@Implementation
|
||||
protected static boolean isFileEncryptedNativeOrEmulated() {
|
||||
return sIsFileEncryptedNativeOrEmulated;
|
||||
protected static boolean isFileEncrypted() {
|
||||
return sIsFileEncrypted;
|
||||
}
|
||||
|
||||
public static void setIsFileEncryptedNativeOrEmulated(boolean encrypted) {
|
||||
sIsFileEncryptedNativeOrEmulated = encrypted;
|
||||
public static void setIsFileEncrypted(boolean encrypted) {
|
||||
sIsFileEncrypted = encrypted;
|
||||
}
|
||||
|
||||
private VolumeInfo createVolumeInfo(String volumeId) {
|
||||
|
Reference in New Issue
Block a user