Merge "New Pipeline: Better disable some suspect old codepaths" (9bd3bf8a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -4287,7 +4287,9 @@ public class StatusBar extends CoreStartable implements
		Log.v(TAG, "configuration changed: " + mContext.getResources().getConfiguration());
		}

		if (!mFeatureFlags.isNewNotifPipelineRenderingEnabled()) {
		mViewHierarchyManager.updateRowStates();
		}
		mScreenPinningRequest.onConfigurationChanged();
		}

+13 −8

Original line number	Diff line number	Diff line
		@@ -305,6 +305,9 @@ public class StatusBarNotificationPresenter implements NotificationPresenter,

		@Override
		public void updateNotificationViews(final String reason) {
		if (!mFeatureFlags.checkLegacyPipelineEnabled()) {
		return;
		}
		// The function updateRowStates depends on both of these being non-null, so check them here.
		// We may be called before they are set from DeviceProvisionedController's callback.
		if (mScrimController == null) return;
		@@ -325,6 +328,7 @@ public class StatusBarNotificationPresenter implements NotificationPresenter,
		// End old BaseStatusBar.userSwitched
		if (MULTIUSER_DEBUG) mNotificationPanel.setHeaderDebugInfo("USER " + newUserId);
		mCommandQueue.animateCollapsePanels();
		if (!mFeatureFlags.isNewNotifPipelineRenderingEnabled()) {
		if (mReinflateNotificationsOnUserSwitched) {
		updateNotificationsOnDensityOrFontScaleChanged();
		mReinflateNotificationsOnUserSwitched = false;
		@@ -334,6 +338,7 @@ public class StatusBarNotificationPresenter implements NotificationPresenter,
		mDispatchUiModeChangeOnUserSwitched = false;
		}
		updateNotificationViews("user switched");
		}
		mMediaManager.clearCurrentMediaNotification();
		mStatusBar.setLockscreenUser(newUserId);
		updateMediaMetaData(true, false);