Merge "Fix flag manager crash" into sc-v2-dev (3f5835d8) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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