From 011c96c6eee7cb489bcf1de7711bf956dc948ae3 Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Sat, 30 Oct 2021 21:43:18 -0400 Subject: [PATCH 1/2] Fix Coordinators failing to build with gradle build in sysui-studio error: @Subcomponent.Builder is missing setters for required modules or subcomponents: [com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorsModule] Fixes: 204649316 Test: gradle build Change-Id: I7e372d73a683cfb883512b48608043f23017053e --- .../collection/coordinator/SensitiveContentCoordinator.kt | 1 + .../collection/coordinator/dagger/CoordinatorsModule.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt index 4ae8e4c81dcea..a115e0400de30 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt @@ -32,6 +32,7 @@ import dagger.Provides @Module object SensitiveContentCoordinatorModule { @Provides + @JvmStatic @CoordinatorScope fun provideCoordinator( dynamicPrivacyController: DynamicPrivacyController, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/dagger/CoordinatorsModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/dagger/CoordinatorsModule.kt index 7575a90ad92e9..a26d50d2a0597 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/dagger/CoordinatorsModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/dagger/CoordinatorsModule.kt @@ -30,6 +30,7 @@ import javax.inject.Scope @Module(subcomponents = [CoordinatorsSubcomponent::class]) object CoordinatorsModule { @SysUISingleton + @JvmStatic @Provides fun notifCoordinators(factory: CoordinatorsSubcomponent.Factory): NotifCoordinators = factory.create().notifCoordinators From ad994eedf3a38e3a275c0cbd7125295a39fcbb21 Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Sat, 30 Oct 2021 21:46:42 -0400 Subject: [PATCH 2/2] New Pipeline: Disable legacy dynamic privacy listener Bug: 204657953 Test: manual Change-Id: I86db5b9a8d9426eddf85de775cfdb5dd292b8713 --- .../statusbar/NotificationViewHierarchyManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java index be3364befbe6b..464b2b69c58e8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java @@ -146,7 +146,9 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle NotificationListContainer listContainer) { mPresenter = presenter; mListContainer = listContainer; - mDynamicPrivacyController.addListener(this); + if (!mFeatureFlags.isNewNotifPipelineRenderingEnabled()) { + mDynamicPrivacyController.addListener(this); + } } /** @@ -522,9 +524,7 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle @Override public void onDynamicPrivacyChanged() { - if (!mFeatureFlags.checkLegacyPipelineEnabled()) { - return; - } + mFeatureFlags.assertLegacyPipelineEnabled(); if (mPerformingUpdate) { Log.w(TAG, "onDynamicPrivacyChanged made a re-entrant call"); }