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

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

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

Change-Id: I5d469e512d3964233b4ff5706637112c2894dc57
This commit is contained in:
Jeff DeCew
2021-11-01 19:39:54 +00:00
committed by Automerger Merge Worker
parent 38175f4a6f 2657c08a78
commit d2905c5821
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java
View File

@@ -146,7 +146,9 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle
NotificationListContainer listContainer) { NotificationListContainer listContainer) {
mPresenter = presenter; mPresenter = presenter;
mListContainer = listContainer; mListContainer = listContainer;
mDynamicPrivacyController.addListener(this); if (!mFeatureFlags.isNewNotifPipelineRenderingEnabled()) {
mDynamicPrivacyController.addListener(this);
}
} }
/** /**
@@ -522,9 +524,7 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle
@Override @Override
public void onDynamicPrivacyChanged() { public void onDynamicPrivacyChanged() {
if (!mFeatureFlags.checkLegacyPipelineEnabled()) { mFeatureFlags.assertLegacyPipelineEnabled();
return;
}
if (mPerformingUpdate) { if (mPerformingUpdate) {
Log.w(TAG, "onDynamicPrivacyChanged made a re-entrant call"); Log.w(TAG, "onDynamicPrivacyChanged made a re-entrant call");
} }

1
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt
View File

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

1
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/dagger/CoordinatorsModule.kt
View File

@@ -30,6 +30,7 @@ import javax.inject.Scope
@Module(subcomponents = [CoordinatorsSubcomponent::class]) @Module(subcomponents = [CoordinatorsSubcomponent::class])
object CoordinatorsModule { object CoordinatorsModule {
@SysUISingleton @SysUISingleton
@JvmStatic
@Provides @Provides
fun notifCoordinators(factory: CoordinatorsSubcomponent.Factory): NotifCoordinators = fun notifCoordinators(factory: CoordinatorsSubcomponent.Factory): NotifCoordinators =
factory.create().notifCoordinators factory.create().notifCoordinators