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

Commit 0270ec86 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Restore removed block to create dependencies" into udc-dev am:...

Merge "Restore removed block to create dependencies" into udc-dev am: d2a94221 am: 34810981 am: 7b562eac

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



Change-Id: I69dcb1c683f43116cffa87b811ec5235589666d7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18bfe9c1 7b562eac
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
@@ -732,4 +732,19 @@ public abstract class WMShellModule {
    static DesktopModeTaskRepository provideDesktopModeTaskRepository() {
        return new DesktopModeTaskRepository();
    }

    //
    // Misc
    //

    // TODO: Temporarily move dependencies to this instead of ShellInit since that is needed to add
    // the callback. We will be moving to a different explicit startup mechanism in a follow- up CL.
    @WMSingleton
    @ShellCreateTriggerOverride
    @Provides
    static Object provideIndependentShellComponentsToCreate(
            DefaultMixedHandler defaultMixedHandler,
            Optional<DesktopModeController> desktopModeController) {
        return new Object();
    }
}