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

Commit 10d4b8de authored by Dave Mankoff's avatar Dave Mankoff
Browse files

RESTRICT AUTOMERGE Ensure that DozeFactory uses Main Thread Handler. 

Fixes: 157220475
Test: atest SystemUITests
Change-Id: I57a9c67aa4d2bcb54a31128f31224ff01935058f
parent 175d91f6

packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java

+0 −6
Original line number Diff line number Diff line
@@ -96,12 +96,6 @@ public class DependencyProvider { 
        return new AmbientDisplayConfiguration(context);

    }



    /** */

    @Provides

    public Handler provideHandler() {

        return new Handler();

    }



    @Singleton

    @Provides

    public DataSaverController provideDataSaverController(NetworkController networkController) {

packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.Handler; 
import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.systemui.R;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dock.DockManager;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.plugins.FalsingManager;
@@ -69,7 +70,7 @@ public class DozeFactory { 
            WakefulnessLifecycle wakefulnessLifecycle, KeyguardUpdateMonitor keyguardUpdateMonitor,

            DockManager dockManager, @Nullable IWallpaperManager wallpaperManager,

            ProximitySensor proximitySensor,

            DelayedWakeLock.Builder delayedWakeLockBuilder, Handler handler,

            DelayedWakeLock.Builder delayedWakeLockBuilder, @Main Handler handler,

            DelayableExecutor delayableExecutor,

            BiometricUnlockController biometricUnlockController,

            BroadcastDispatcher broadcastDispatcher, DozeHost dozeHost) {

packages/SystemUI/src/com/android/systemui/util/concurrency/ConcurrencyModule.java

+9 −0
Original line number Diff line number Diff line
@@ -91,6 +91,15 @@ public abstract class ConcurrencyModule { 
        return new Handler(mainLooper);

    }



    /**

     * @deprecated Please specify @Main or @Background when injecting a Handler or use an Executor.

     */

    @Deprecated

    @Provides

    public static Handler provideHandler() {

        return new Handler();

    }



    /**

     * Provide a Background-Thread Executor by default.

     */