diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2019-02-26 01:44:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-26 01:44:28 +0000 |
| commit | 92011a08e485ccea455ed843a220b6439aa16ad5 (patch) | |
| tree | 97b0bc52658b870f622604c3ed764ee8fb3d9822 | |
| parent | 36051144f8e8dc6acf4d2494a23f5c9d84d0bba5 (diff) | |
| parent | 0de21d7e818819f0187ca3e6de6c3f1deb95ebb6 (diff) | |
Merge "Schematize Crypto state system property"
| -rw-r--r-- | core/java/com/android/internal/os/RoSystemProperties.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/core/java/com/android/internal/os/RoSystemProperties.java b/core/java/com/android/internal/os/RoSystemProperties.java index f4902d46992b..524a5cc353f3 100644 --- a/core/java/com/android/internal/os/RoSystemProperties.java +++ b/core/java/com/android/internal/os/RoSystemProperties.java @@ -61,17 +61,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(""); + 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); |