Merge "Fix Chooser teamfood flag logic" into tm-qpr-dev

1 files changed, 6 insertions, 1 deletions

diff --git a/java/src/com/android/intentresolver/flags/DeviceConfigProxy.kt b/java/src/com/android/intentresolver/flags/DeviceConfigProxy.kt
index ac782471..d1494fe7 100644
--- a/java/src/com/android/intentresolver/flags/DeviceConfigProxy.kt
+++ b/java/src/com/android/intentresolver/flags/DeviceConfigProxy.kt
@@ -22,7 +22,12 @@ import com.android.systemui.flags.ParcelableFlag
 internal class DeviceConfigProxy {
     fun isEnabled(flag: ParcelableFlag<Boolean>): Boolean? {
         return runCatching {
-            DeviceConfig.getBoolean(flag.namespace, flag.name, flag.default)
+            val hasProperty = DeviceConfig.getProperty(flag.namespace, flag.name) != null
+            if (hasProperty) {
+                DeviceConfig.getBoolean(flag.namespace, flag.name, flag.default)
+            } else {
+                null
+            }
         }.getOrDefault(null)
     }
 }