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

Merge "Schematize Crypto system properties"

Browse Source 
am: 03c14760a5

Change-Id: Ic0bb3a6f206c68ce705c572ad5714475690a3b1c
This commit is contained in:
Kiyoung Kim
2019-02-20 16:38:08 -08:00
committed by android-build-merger
parent c850654edc 03c14760a5
commit f7b3bdb53b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);