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

Merge "Schematize Crypto state system property"

Browse Source 
am: 88b57a2c4d

Change-Id: Idb96ab95b1ea69a636f315edeb84c8ba025d75bd
This commit is contained in:
Kiyoung Kim
2019-03-12 21:33:34 -07:00
committed by android-build-merger
parent d3c00327b9 88b57a2c4d
commit d5f216ac8b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/com/android/internal/os/RoSystemProperties.java
View File

@@ -44,17 +44,19 @@ public class RoSystemProperties {
SystemProperties.getBoolean("ro.fw.system_user_split", false);
// ------ ro.crypto.* -------- //
public static final String CRYPTO_STATE = SystemProperties.get("ro.crypto.state");
public static final String CRYPTO_TYPE = CryptoProperties.type().orElse("none");
public static final CryptoProperties.state_values CRYPTO_STATE =
CryptoProperties.state().orElse(CryptoProperties.state_values.UNSUPPORTED);
public static final CryptoProperties.type_values CRYPTO_TYPE =
CryptoProperties.type().orElse(CryptoProperties.type_values.NONE);
// These are pseudo-properties
public static final boolean CRYPTO_ENCRYPTABLE =
!CRYPTO_STATE.isEmpty() && !"unsupported".equals(CRYPTO_STATE);
CRYPTO_STATE != CryptoProperties.state_values.UNSUPPORTED;
public static final boolean CRYPTO_ENCRYPTED =
"encrypted".equalsIgnoreCase(CRYPTO_STATE);
CRYPTO_STATE == CryptoProperties.state_values.ENCRYPTED;
public static final boolean CRYPTO_FILE_ENCRYPTED =
"file".equalsIgnoreCase(CRYPTO_TYPE);
CRYPTO_TYPE == CryptoProperties.type_values.FILE;
public static final boolean CRYPTO_BLOCK_ENCRYPTED =
"block".equalsIgnoreCase(CRYPTO_TYPE);
CRYPTO_TYPE == CryptoProperties.type_values.BLOCK;
public static final boolean CONTROL_PRIVAPP_PERMISSIONS_LOG =
"log".equalsIgnoreCase(CONTROL_PRIVAPP_PERMISSIONS);