Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68edfb09 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "Fix flag manager crash" into sc-v2-dev am: 3f5835d8 

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

Change-Id: Ib6be366e91dd798273aef5ff3a33bd207bda7291
parents e2a29696 3f5835d8

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