From 7a2f3afc9111ba0c3a7176e9bdb2a55ddb9d3772 Mon Sep 17 00:00:00 2001
From: Andrey Epin <ayepin@google.com>
Date: Tue, 7 Feb 2023 13:00:50 -0800
Subject: Fix Chooser teamfood flag logic

Explisitly check for flag presense.

Test: manual testing
Change-Id: I16aa1dc536548754d7be8ce0c6dba9f5737963c0
---
 java/src/com/android/intentresolver/flags/DeviceConfigProxy.kt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'java')

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)
     }
 }
-- 
cgit v1.2.3-59-g8ed1b