Merge "Fix flag manager crash" into sc-v2-dev

2021-11-15 18:32:10 +00:00
parent ba64f849cf f667354d7d
commit 3f5835d848
1 changed files with 2 additions and 2 deletions
--- 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