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

Commit 985854c5 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Remove full qualifier in SystemUIModule for SystemStatusAnimationScheduler" into udc-dev

parents 896e037a 7b2a0553
Loading
Loading
Loading
Loading
+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