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

Commit 512e18ea authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "[Dumpsys CLI] Remove Exception bounds on LogBufferEulogizer"... 

Merge "Merge "[Dumpsys CLI] Remove Exception bounds on LogBufferEulogizer" into udc-qpr-dev am: d388e7b4" into udc-qpr-dev-plus-aosp am: 4b8ab431

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



Change-Id: I208e63372d9dba07c42c82194ea181de0105d2f8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f292ca3b 4b8ab431

packages/SystemUI/src/com/android/systemui/SystemUIService.java

+2 −5
Original line number Diff line number Diff line
@@ -82,11 +82,8 @@ public class SystemUIService extends Service { 
        mLogBufferFreezer.attach(mBroadcastDispatcher);



        // Attempt to dump all LogBuffers for any uncaught exception

        mUncaughtExceptionPreHandlerManager.registerHandler((thread, throwable) -> {

            if (throwable instanceof Exception) {

                mLogBufferEulogizer.record(((Exception) throwable));

            }

        });

        mUncaughtExceptionPreHandlerManager.registerHandler(

                (thread, throwable) -> mLogBufferEulogizer.record(throwable));



        // If configured, set up a battery notification

        if (getResources().getBoolean(R.bool.config_showNotificationForUnknownBatteryState)) {

packages/SystemUI/src/com/android/systemui/dump/LogBufferEulogizer.kt

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class LogBufferEulogizer( 
     * The file will be prefaced by the [reason], which will then be returned (presumably so it can

     * be thrown).

     */

    fun <T : Exception> record(reason: T): T {

    fun <T : Throwable> record(reason: T): T {

        val start = systemClock.uptimeMillis()

        var duration = 0L