commit 66076789350c3e58a4a80a3cf02608b4b6197946
author Dave Mankoff <mankoff@google.com> Mon Nov 15 18:57:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 15 18:57:40 2021 +0000
tree a7598003fda5f5d7d52b2d0c7f8947f6bab940e4
parent b3546c64062d6e919e042802916ad3bd82e32973
parent 68edfb0930b95b00bcb053c716bc1aa221e974f5

Merge "Fix flag manager crash" into sc-v2-dev am: 3f5835d848 am: 68edfb0930

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16248587

Change-Id: I6b1c755fbd98941eff05256e89b991ac5972d0ff

packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt

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 1dc555e..e61cb5c 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 @@
 
     /** 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