Merge changes Ib5bcfb6a,I46c2a472,If0c75774,Iab7ba8d3 am: b56960bc76

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2016260

Change-Id: I7274a1bf200eb9bcd38dd949bc34961a13aa0a0b

core/java/android/os/storage/StorageManager.java

@@ -82,7 +82,6 @@ import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.provider.MediaStore;
 import android.provider.Settings;
-import android.sysprop.VoldProperties;
 import android.system.ErrnoException;
 import android.system.Os;
 import android.system.OsConstants;
@@ -1636,11 +1635,8 @@ public class StorageManager {
      *         false not encrypted or file encrypted
      */
     public static boolean isBlockEncrypted() {
-        if (!isEncrypted()) {
         return false;
     }
-        return RoSystemProperties.CRYPTO_BLOCK_ENCRYPTED;
-    }
 
     /** {@hide}
      * Is this device block encrypted with credentials?
@@ -1649,20 +1645,9 @@ public class StorageManager {
      *         false not encrypted, file encrypted or default block encrypted
      */
     public static boolean isNonDefaultBlockEncrypted() {
-        if (!isBlockEncrypted()) {
         return false;
     }
 
-        try {
-            IStorageManager storageManager = IStorageManager.Stub.asInterface(
-                    ServiceManager.getService("mount"));
-            return storageManager.getPasswordType() != CRYPT_TYPE_DEFAULT;
-        } catch (RemoteException e) {
-            Log.e(TAG, "Error getting encryption type");
-            return false;
-        }
-    }
-
     /** {@hide}
      * Is this device in the process of being block encrypted?
      * @return true for encrypting.
@@ -1674,8 +1659,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("");
+        return false;
-        return !"".equalsIgnoreCase(state);
     }
 
     /** {@hide}
@@ -1690,8 +1674,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("");
+        return false;
-        return "trigger_restart_min_framework".equals(status);
     }
 
     /** {@hide} */