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

Commit 365abe44 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Enable shell thread" into sc-dev am: 99051f24 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8a7fe91ac490d8c9de3a4f44472bfbed9edb792
parents 0a4651be 99051f24

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -574,4 +574,7 @@ 


    <!-- Whether to use the split 2-column notification shade -->

    <bool name="config_use_split_notification_shade">false</bool>



    <!-- Determines whether the shell features all run on another thread. -->

    <bool name="config_enableShellMainThread">false</bool>

</resources>

packages/SystemUI/src/com/android/systemui/wmshell/WMShellBaseModule.java

+12 −6
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.view.WindowManager; 
import com.android.internal.graphics.SfVsyncFrameCallbackProvider;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.statusbar.IStatusBarService;

import com.android.systemui.R;

import com.android.systemui.dagger.WMComponent;

import com.android.systemui.dagger.WMSingleton;

import com.android.systemui.dagger.qualifiers.Main;
@@ -97,7 +98,12 @@ import dagger.Provides; 
@Module

public abstract class WMShellBaseModule {



    private static final boolean ENABLE_SHELL_MAIN_THREAD = false;

    /**

     * Returns whether to enable a separate shell thread for the shell features.

     */

    private static boolean enableShellMainThread(Context context) {

        return context.getResources().getBoolean(R.bool.config_enableShellMainThread);

    }



    //

    // Shell Concurrency - Components used for managing threading in the Shell and SysUI
@@ -120,8 +126,8 @@ public abstract class WMShellBaseModule { 
    @WMSingleton

    @Provides

    @ShellMainThread

    public static Handler provideShellMainHandler(@Main Handler sysuiMainHandler) {

        if (ENABLE_SHELL_MAIN_THREAD) {

    public static Handler provideShellMainHandler(Context context, @Main Handler sysuiMainHandler) {

        if (enableShellMainThread(context)) {

             HandlerThread mainThread = new HandlerThread("wmshell.main");

             mainThread.start();

             return mainThread.getThreadHandler();
@@ -135,9 +141,9 @@ public abstract class WMShellBaseModule { 
    @WMSingleton

    @Provides

    @ShellMainThread

    public static ShellExecutor provideShellMainExecutor(@ShellMainThread Handler mainHandler,

            @Main ShellExecutor sysuiMainExecutor) {

        if (ENABLE_SHELL_MAIN_THREAD) {

    public static ShellExecutor provideShellMainExecutor(Context context,

            @ShellMainThread Handler mainHandler, @Main ShellExecutor sysuiMainExecutor) {

        if (enableShellMainThread(context)) {

            return new HandlerExecutor(mainHandler);

        }

        return sysuiMainExecutor;