Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dave Mankoff
2021-11-15 18:32:10 +00:00
committed by Android (Google) Code Review
parent ba64f849cf f667354d7d
commit 3f5835d848
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,9 +92,9 @@ class FlagManager constructor(
/** Returns the stored value or null if not set. */ /** Returns the stored value or null if not set. */
fun isEnabled(id: Int): Boolean? { fun isEnabled(id: Int): Boolean? {
val data: String = Settings.Secure.getString( val data: String? = Settings.Secure.getString(
context.contentResolver, keyToSettingsPrefix(id)) context.contentResolver, keyToSettingsPrefix(id))
if (data.isEmpty()) { if (data == null || data?.isEmpty()) {
return null return null
} }
val json: JSONObject val json: JSONObject