diff options
| author | 2023-02-08 05:49:44 +0000 | |
|---|---|---|
| committer | 2023-02-08 05:49:44 +0000 | |
| commit | 115006a5ec3794a87b39602aa45d9764558013c5 (patch) | |
| tree | 5b557f8a49eb15d68832328173fbb9ced8fea4ae /java/src | |
| parent | 754465efee66a806bddd72c699b87a53a03b3333 (diff) | |
| parent | f7a298f8140f47f39c19180973f28d9d45ecc265 (diff) | |
Merge "Fix Chooser teamfood flag logic" into tm-qpr-dev am: 119667adac am: f7a298f814
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/21322991
Change-Id: Ia1de415497b8d6af5edb139a3985e6302ed41349
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) } } |