commit f7b3bdb53bab9dfee3bcbba500f3f538cb00a737
author Kiyoung Kim <kiyoungkim@google.com> Wed Feb 20 16:38:08 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Feb 20 16:38:08 2019 -0800
tree 79d1506d25f7f2886dc4d972ab1460e4e859024a
parent c850654edc1760f0f529fbcd50d51b195e210e13
parent 03c14760a593b8bbea502fc8cbcc0ffe1e2ac058

Merge "Schematize Crypto system properties"
am: 03c14760a5

Change-Id: Ic0bb3a6f206c68ce705c572ad5714475690a3b1c

core/java/com/android/internal/os/RoSystemProperties.java

diff --git a/core/java/com/android/internal/os/RoSystemProperties.java b/core/java/com/android/internal/os/RoSystemProperties.java
index dc660a4..209933a 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 @@
 
     // ------ 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);