Merge changes from topic "b204127880_pipeline_backport_2" into sc-v2-dev am: 2657c08a78

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

Change-Id: I5d469e512d3964233b4ff5706637112c2894dc57

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");
         }

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,

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