Merge "Revert "Schematize vold system properties"" am: 6ee45c6f14

am: 510c8c463f

Change-Id: If137d417a8f042e8cbde842578caaa3e54bb8c6d

1 files changed, 2 insertions, 3 deletions

diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 6b5927992677..d072d02741ed 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -52,7 +52,6 @@ import android.os.ServiceManager;
 import android.os.ServiceManager.ServiceNotFoundException;
 import android.os.SystemProperties;
 import android.provider.Settings;
-import android.sysprop.VoldProperties;
 import android.system.ErrnoException;
 import android.system.Os;
 import android.system.OsConstants;
@@ -1466,7 +1465,7 @@ public class StorageManager {
      * framework, so no service needs to check for changes during their lifespan
      */
     public static boolean isBlockEncrypting() {
-        final String state = VoldProperties.encrypt_progress().orElse("");
+        final String state = SystemProperties.get("vold.encrypt_progress", "");
         return !"".equalsIgnoreCase(state);
     }
 
@@ -1482,7 +1481,7 @@ public class StorageManager {
      * framework, so no service needs to check for changes during their lifespan
      */
     public static boolean inCryptKeeperBounce() {
-        final String status = VoldProperties.decrypt().orElse("");
+        final String status = SystemProperties.get("vold.decrypt");
         return "trigger_restart_min_framework".equals(status);
     }