diff options
| author | 2019-02-21 00:16:45 +0000 | |
|---|---|---|
| committer | 2019-02-21 00:16:45 +0000 | |
| commit | 03c14760a593b8bbea502fc8cbcc0ffe1e2ac058 (patch) | |
| tree | 8abc69c138002eff3263f0800f69d34b80c83f1b | |
| parent | f8881b68214764b490e21de427cc3262c1f6977f (diff) | |
| parent | feab82cf82778d7db88c7b7f3560e0f54b360dae (diff) | |
Merge "Schematize Crypto system properties"
| -rw-r--r-- | core/java/com/android/internal/os/RoSystemProperties.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/RoSystemProperties.java b/core/java/com/android/internal/os/RoSystemProperties.java index dc660a452c3b..209933adf91d 100644 --- a/core/java/com/android/internal/os/RoSystemProperties.java +++ b/core/java/com/android/internal/os/RoSystemProperties.java @@ -17,6 +17,7 @@ package com.android.internal.os; import android.os.SystemProperties; +import android.sysprop.CryptoProperties; /** * This is a cache of various ro.* properties so that they can be read just once @@ -44,7 +45,7 @@ public class RoSystemProperties { // ------ ro.crypto.* -------- // public static final String CRYPTO_STATE = SystemProperties.get("ro.crypto.state"); - public static final String CRYPTO_TYPE = SystemProperties.get("ro.crypto.type"); + public static final String CRYPTO_TYPE = CryptoProperties.type().orElse("none"); // These are pseudo-properties public static final boolean CRYPTO_ENCRYPTABLE = !CRYPTO_STATE.isEmpty() && !"unsupported".equals(CRYPTO_STATE); |