Merge "Adjust hasAdoptable() based on debug flags."

2019-10-02 00:42:06 +00:00
parent 89a3f144f8 2fea6afc91
commit f448e212bd
1 changed files with 8 additions and 1 deletions
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -1580,7 +1580,14 @@ public class StorageManager {

    /** {@hide} */
    public static boolean hasAdoptable() {
-        return SystemProperties.getBoolean(PROP_HAS_ADOPTABLE, false);
+        switch (SystemProperties.get(PROP_ADOPTABLE)) {
+            case "force_on":
+                return true;
+            case "force_off":
+                return false;
+            default:
+                return SystemProperties.getBoolean(PROP_HAS_ADOPTABLE, false);
+        }
    }

    /**