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

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

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

Change-Id: I3d51861d4baf3815caa3027c400a846f7f99a272
This commit is contained in:
Eric Biggers
2022-03-10 01:18:14 +00:00
committed by Automerger Merge Worker
parent 6d66f9a556 d75803d52b
commit 85ea70c3c3
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/os/storage/StorageManager.java
View File

@@ -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,10 +1635,7 @@ public class StorageManager {
* false not encrypted or file encrypted
*/
public static boolean isBlockEncrypted() {
if (!isEncrypted()) {
return false;
}
return RoSystemProperties.CRYPTO_BLOCK_ENCRYPTED;
return false;
}
/** {@hide}
@@ -1649,18 +1645,7 @@ 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;
}
return false;
}
/** {@hide}
@@ -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 !"".equalsIgnoreCase(state);
return false;
}
/** {@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 "trigger_restart_min_framework".equals(status);
return false;
}
/** {@hide} */