From 2fea6afc91df6d311ea7c89954fbf2122f0c1d18 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Tue, 1 Oct 2019 14:09:18 -0600
Subject: [PATCH] Adjust hasAdoptable() based on debug flags.

When a developer has requested "sm set-force-adoptable", adjust the
return value of hasAdoptable() to reflect it.  This ensures that we
run relevant CTS tests.

Bug: 141540368
Test: none
Change-Id: I483c0df1a574021eafcd1663d41a2f4097fe986a
---
 core/java/android/os/storage/StorageManager.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 351462f8d68e8..2d8af83c7ca76 100644
--- 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);
+        }
     }
 
     /**