Merge changes from topic "b204127880_pipeline_backport_2" into sc-v2-dev am: 2657c08a78 (d2905c58) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -146,8 +146,10 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle
		NotificationListContainer listContainer) {
		mPresenter = presenter;
		mListContainer = listContainer;
		if (!mFeatureFlags.isNewNotifPipelineRenderingEnabled()) {
		mDynamicPrivacyController.addListener(this);
		}
		}

		/**
		* Updates the visual representation of the notifications.
		@@ -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");
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import dagger.Provides
		@Module
		object SensitiveContentCoordinatorModule {
		@Provides
		@JvmStatic
		@CoordinatorScope
		fun provideCoordinator(
		dynamicPrivacyController: DynamicPrivacyController,

+1 −0

Original line number	Diff line number	Diff line
		@@ -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