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

Commit 38f5e7d0 authored by Brad Hinegardner's avatar Brad Hinegardner
Browse files

Ensure Keyguard Preview Renderer is created on the main thread 

When in guest mode, keyguardPreviewRenderer is created not on the main
thread, which is causing crashes due to various dependent classes
requiring construction on the main thread.

This is causing a silent crash in wallpaper picker preventing users from
seeing a preview of the lock screen.

The stack trace does not make it possible to track all of these down
individually and fix it at the source of the class.

This fix is behind a flag to be able to ensure that the performance is
satisfactory before progressing.

Bug: 343732179
Test: atest CustomizationProviderTest.kt
Flag: com.android.systemui.lockscreen_preview_renderer_create_on_main_thread
Change-Id: I6da9b473d53e2326fdf217a6f7a2540c0bb66dd8
parent 8b2393d4

packages/SystemUI/aconfig/systemui.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -1224,3 +1224,13 @@ flag { 
        purpose: PURPOSE_BUGFIX

   }

}



flag {

   name: "lockscreen_preview_renderer_create_on_main_thread"

   namespace: "systemui"

   description: "Force preview renderer to be created on the main thread"

   bug: "343732179"

   metadata {

        purpose: PURPOSE_BUGFIX

   }

}
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardRemotePreviewManager.kt

+10 −1
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import android.os.Messenger 
import android.util.ArrayMap

import android.util.Log

import androidx.annotation.VisibleForTesting

import com.android.app.tracing.coroutines.runBlocking

import com.android.systemui.Flags

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Background
@@ -55,7 +57,14 @@ constructor( 


        var observer: PreviewLifecycleObserver? = null

        return try {

            val renderer = previewRendererFactory.create(request)

            val renderer =

                if (Flags.lockscreenPreviewRendererCreateOnMainThread()) {

                    runBlocking ("$TAG#previewRendererFactory.create", mainDispatcher) {

                        previewRendererFactory.create(request)

                    }

                } else {

                    previewRendererFactory.create(request)

                }



            observer =

                PreviewLifecycleObserver(