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

Commit 21c4429b authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Merge "Remove full qualifier in SystemUIModule for... 

Merge "Remove full qualifier in SystemUIModule for SystemStatusAnimationScheduler" into udc-dev am: 985854c5

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



Change-Id: I611c7c232eb7b00f08c81a9714aac25b0fbfa3a0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e95857e 985854c5

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

+2 −3
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.connectivity.ConnectivityModule;

import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler;

import com.android.systemui.statusbar.notification.NotifPipelineFlags;

import com.android.systemui.statusbar.notification.collection.NotifPipeline;

import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinder;
@@ -257,9 +258,7 @@ public abstract class SystemUIModule { 
    abstract FingerprintInteractiveToAuthProvider optionalFingerprintInteractiveToAuthProvider();



    @BindsOptionalOf

    //TODO(b/269430792 remove full qualifier. Full qualifier is used to avoid merge conflict.)

    abstract com.android.systemui.statusbar.events.SystemStatusAnimationScheduler

    optionalSystemStatusAnimationScheduler();

    abstract SystemStatusAnimationScheduler optionalSystemStatusAnimationScheduler();



    @SysUISingleton

    @Binds