From 0de21d7e818819f0187ca3e6de6c3f1deb95ebb6 Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Thu, 21 Feb 2019 14:35:26 +0900 Subject: [PATCH] Schematize Crypto state system property Properties accessed across partitions are now schematized and will become APIs to make explicit interfaces among partitions. Bug: 117924132 Test: m -j Change-Id: Id36208fac5d4de062a51d541b64145560242f8fc --- .../android/internal/os/RoSystemProperties.java | 14 ++++++++------ 1 file 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 f4902d46992b7..524a5cc353f3a 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);