summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Andrey Epin <ayepin@google.com> 2023-02-07 13:00:50 -0800
committer Andrey Epin <ayepin@google.com> 2023-02-07 13:00:50 -0800
commit7a2f3afc9111ba0c3a7176e9bdb2a55ddb9d3772 (patch)
tree9f23f27ae9d59eb08faf29cd203243d244d48cc9 /java
parent89697b484befb174482c92f5072f01836678d46c (diff)
Fix Chooser teamfood flag logic
Explisitly check for flag presense. Test: manual testing Change-Id: I16aa1dc536548754d7be8ce0c6dba9f5737963c0
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/intentresolver/flags/DeviceConfigProxy.kt7
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)
}
}