diff options
| author | 2021-11-15 18:32:10 +0000 | |
|---|---|---|
| committer | 2021-11-15 18:32:10 +0000 | |
| commit | 3f5835d8481280a471148a49535dae190789dd67 (patch) | |
| tree | c78173fba11fa5c7eb4f56245da4fe9b2cdbe758 | |
| parent | ba64f849cf6041b7737176dbc532807dd386b8a7 (diff) | |
| parent | f667354d7d929f131977a222842bbe09602557b6 (diff) | |
Merge "Fix flag manager crash" into sc-v2-dev
| -rw-r--r-- | packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt b/packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt index 1dc555e300b4..e61cb5c9a53e 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt @@ -92,9 +92,9 @@ class FlagManager constructor( /** Returns the stored value or null if not set. */ fun isEnabled(id: Int): Boolean? { - val data: String = Settings.Secure.getString( + val data: String? = Settings.Secure.getString( context.contentResolver, keyToSettingsPrefix(id)) - if (data.isEmpty()) { + if (data == null || data?.isEmpty()) { return null } val json: JSONObject |