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

Commit 27662408 authored by Ned Burns's avatar Ned Burns Committed by Automerger Merge Worker
Browse files

Merge changes from topic "log-buffer" into tm-dev am: ff1b7dc5 

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



Change-Id: Ib3d198cdc207db7a352736a7c0d8993ec3084065
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 74dd1ab4 ff1b7dc5

packages/SystemUI/src/com/android/systemui/log/LogcatEchoTrackerDebug.kt

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ class LogcatEchoTrackerDebug private constructor( 
                Settings.Global.getUriFor(BUFFER_PATH),

                true,

                object : ContentObserver(Handler(mainLooper)) {

                    override fun onChange(selfChange: Boolean, uri: Uri) {

                    override fun onChange(selfChange: Boolean, uri: Uri?) {

                        super.onChange(selfChange, uri)

                        cachedBufferLevels.clear()

                    }
@@ -70,7 +70,7 @@ class LogcatEchoTrackerDebug private constructor( 
                Settings.Global.getUriFor(TAG_PATH),

                true,

                object : ContentObserver(Handler(mainLooper)) {

                    override fun onChange(selfChange: Boolean, uri: Uri) {

                    override fun onChange(selfChange: Boolean, uri: Uri?) {

                        super.onChange(selfChange, uri)

                        cachedTagLevels.clear()

                    }
@@ -110,7 +110,7 @@ class LogcatEchoTrackerDebug private constructor( 
    }



    private fun parseProp(propValue: String?): LogLevel {

        return when (propValue?.toLowerCase()) {

        return when (propValue?.lowercase()) {

            "verbose" -> LogLevel.VERBOSE

            "v" -> LogLevel.VERBOSE

            "debug" -> LogLevel.DEBUG