diff options
| author | 2023-02-08 05:08:41 +0000 | |
|---|---|---|
| committer | 2023-02-08 05:08:41 +0000 | |
| commit | f7a298f8140f47f39c19180973f28d9d45ecc265 (patch) | |
| tree | c51c5be3539ce35a565dbfa5efcb2920df86d6e9 /java/src | |
| parent | f8edf7fb11a949b4d3b35fdfec614ff39a3c05ab (diff) | |
| parent | 119667adacbf9c62dbf52a0a81af425833d2c9d5 (diff) | |
Merge "Fix Chooser teamfood flag logic" into tm-qpr-dev am: 119667adac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/21322991
Change-Id: I97b39a5ad4b023e6358bca83c0b1c1c929a7a45d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/intentresolver/flags/DeviceConfigProxy.kt | 7 |
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) } } |