Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2969a3f4 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by android-build-merger
Browse files

Merge "Schematize Crypto system properties" am: 03c14760 

am: f7b3bdb5

Change-Id: I47bbcec88d71840827653e9a70d91bf442ba1c22
parents 49574608 f7b3bdb5

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

+2 −1
Original line number Diff line number Diff line
@@ -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);