From 7dfc51aee448382a3f7a80f61604c00379afaa69 Mon Sep 17 00:00:00 2001
From: Han Wang <416810799@qq.com>
Date: Fri, 11 Jan 2019 12:22:16 +0100
Subject: [PATCH] sdk: Trust: Return TRUST_FEATURE_LEVEL_BAD on encryption
 inactive

 * Prepare to change the logic in Trust frontend.

Change-Id: I8fafdc891bdc17eb92fbfe4be33ed2cd074bad74
---
 .../lineageos/platform/internal/TrustInterfaceService.java   | 5 -----
 1 file changed, 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: