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

Stub out some FDE methods in StorageManager

Browse Source 
Now that FDE is no longer supported, stub out some methods in
StorageManager that return FDE state.  This allows
StorageManager.getPasswordType() to be removed, and it prepares for
removing these methods later.

Bug: 208476087
Change-Id: Ib5bcfb6a0279150fec33f2c3edd0431b450c90f4
(cherry picked from commit 401bf8a176)
Merged-In: Ib5bcfb6a0279150fec33f2c3edd0431b450c90f4
This commit is contained in:
Eric Biggers
2022-01-26 05:04:06 +00:00
parent 031a23fa87
commit f4f345dbee
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

@@ -83,7 +83,6 @@ import android.os.UserHandle;
import android.provider.DeviceConfig;
import android.provider.MediaStore;
import android.provider.Settings;
import android.sysprop.VoldProperties;
import android.system.ErrnoException;
import android.system.Os;
import android.system.OsConstants;
@@ -1739,10 +1738,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}
@@ -1752,18 +1748,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}
@@ -1777,8 +1762,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}
@@ -1793,8 +1777,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} */