From f667354d7d929f131977a222842bbe09602557b6 Mon Sep 17 00:00:00 2001
From: Jay Aliomer <aaliomer@google.com>
Date: Fri, 12 Nov 2021 14:09:24 -0500
Subject: Fix flag manager crash

Bug: 196602427
Test: manual
Change-Id: I2690096429bc784b45e4e0c6cc32fb2e06becfb4
---
 .../SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt     | 4 ++--
 1 file 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
-- 
cgit v1.2.3-59-g8ed1b