Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove full qualifier in SystemUIModule for SystemStatusAnimationScheduler" into tm-qpr-dev am: d56e9d5940

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

Change-Id: I4ed87e61a27da44243ef46e5d12453d026e30286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Johannes Gallmann
2023-03-03 17:10:17 +00:00
committed by Automerger Merge Worker
parent cf78af279f d56e9d5940
commit 886cc125a5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
View File

@@ -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.collection.NotifPipeline;
import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinder;
import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl;
@@ -256,9 +257,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