aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHan Wang <416810799@qq.com>2019-01-11 12:22:16 +0100
committerMichael Bestas <mkbestas@lineageos.org>2019-01-21 15:55:27 +0100
commit7dfc51aee448382a3f7a80f61604c00379afaa69 (patch)
tree5aca014d52a29734ee76da125ea7d48f26eb3288
parenteef2974c7fb1499d667a7c2578e3f71bc64715f3 (diff)
downloadlineage-sdk-7dfc51aee448382a3f7a80f61604c00379afaa69.tar.gz
lineage-sdk-7dfc51aee448382a3f7a80f61604c00379afaa69.tar.bz2
lineage-sdk-7dfc51aee448382a3f7a80f61604c00379afaa69.zip
sdk: Trust: Return TRUST_FEATURE_LEVEL_BAD on encryption inactive
* Prepare to change the logic in Trust frontend. Change-Id: I8fafdc891bdc17eb92fbfe4be33ed2cd074bad74
-rw-r--r--lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
index f912c42b..c2c01712 100644
--- a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
+++ b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
@@ -307,8 +307,6 @@ public class TrustInterfaceService extends LineageSystemService {
return TrustInterface.ERROR_UNDEFINED;
}
- boolean isOldDevice =
- mContext.getResources().getBoolean(R.bool.config_trustLegacyEncryption);
int status = policyManager.getStorageEncryptionStatus();
switch (status) {
@@ -318,9 +316,6 @@ public class TrustInterfaceService extends LineageSystemService {
case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_DEFAULT_KEY:
return TrustInterface.TRUST_FEATURE_LEVEL_POOR;
case DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE:
- return isOldDevice ?
- TrustInterface.TRUST_FEATURE_LEVEL_POOR :
- TrustInterface.TRUST_FEATURE_LEVEL_BAD;
case DevicePolicyManager.ENCRYPTION_STATUS_UNSUPPORTED:
return TrustInterface.TRUST_FEATURE_LEVEL_BAD;
default: