diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2018-01-04 16:46:48 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2018-01-04 18:50:14 -0700 |
| commit | 8eb783b21e38b15e41a8268d6b08f24bc62bc21f (patch) | |
| tree | 6c5e0a5de3a9e10ed610b682e23b042a9c8677ce /cmds/sm | |
| parent | f262c7f2e00b9239e0c333b81f1ccb1953713ab1 (diff) | |
FBE devices now fully support adoptable storage.
We've finished all the underlying work to support adoptable storage
on FBE devices, so remove the code that was disabling it by default.
Introduce feature flag to make it easier to detect devices that
support adoptable storage.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Bug: 29923055, 25861755, 33252673, 37289651
Change-Id: I3630d690c9e66c7e41e316a4263ea2eb1e752ad3
Diffstat (limited to 'cmds/sm')
| -rw-r--r-- | cmds/sm/src/com/android/commands/sm/Sm.java | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/cmds/sm/src/com/android/commands/sm/Sm.java b/cmds/sm/src/com/android/commands/sm/Sm.java index 77e8efafa2a0..2bb7edcc7467 100644 --- a/cmds/sm/src/com/android/commands/sm/Sm.java +++ b/cmds/sm/src/com/android/commands/sm/Sm.java @@ -16,16 +16,10 @@ package com.android.commands.sm; -import static android.os.storage.StorageManager.PROP_ADOPTABLE_FBE; -import static android.os.storage.StorageManager.PROP_HAS_ADOPTABLE; -import static android.os.storage.StorageManager.PROP_VIRTUAL_DISK; - -import android.os.IBinder; import android.os.IVoldTaskListener; import android.os.PersistableBundle; import android.os.RemoteException; import android.os.ServiceManager; -import android.os.SystemProperties; import android.os.storage.DiskInfo; import android.os.storage.IStorageManager; import android.os.storage.StorageManager; @@ -145,15 +139,7 @@ public final class Sm { } public void runHasAdoptable() { - final boolean hasHardware = SystemProperties.getBoolean(PROP_HAS_ADOPTABLE, false) - || SystemProperties.getBoolean(PROP_VIRTUAL_DISK, false); - final boolean hasSoftware; - if (StorageManager.isFileEncryptedNativeOnly()) { - hasSoftware = SystemProperties.getBoolean(PROP_ADOPTABLE_FBE, false); - } else { - hasSoftware = true; - } - System.out.println(hasHardware && hasSoftware); + System.out.println(StorageManager.hasAdoptable()); } public void runGetPrimaryStorageUuid() throws RemoteException { |