Merge "Revert^2 "Fix isRemoved not being set for rows"" into main (709f1512) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,16 @@ flag {
		bug: "343942780"
		}

		flag {
		name: "notification_row_is_removed_fix"
		namespace: "systemui"
		description: "Fix incorrect isRemoved value in ExpandableNotificationRow"
		bug: "417457086"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "notification_ambient_suppression_after_inflation"
		namespace: "systemui"

+0 −12

Original line number	Diff line number	Diff line
		@@ -712,18 +712,6 @@ public final class NotificationEntry extends ListEntry {
		return row != null && row.isDismissed();
		}

		public boolean isRowRemoved() {
		return row != null && row.isRemoved();
		}

		/**
		* @return {@code true} if the row is null or removed
		*/
		public boolean isRemoved() {
		//TODO: recycling invalidates this
		return row == null \|\| row.isRemoved();
		}

		public boolean isRowPinned() {
		return getPinnedStatus().isPinned();
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.systemui.statusbar.notification.row;

		import static com.android.systemui.Flags.notificationRowIsRemovedFix;

		import android.util.ArrayMap;
		import android.util.ArraySet;
		import android.widget.FrameLayout;
		@@ -218,6 +220,13 @@ public final class NotifBindPipeline {
		mStage.deleteStageParams(entry);
		mStartProcessor.cancel(entry);
		}

		@Override
		public void onEntryRemoved(NotificationEntry entry, int reason) {
		if (notificationRowIsRemovedFix()) {
		entry.removeRow();
		}
		}
		};

		private @NonNull BindEntry getBindEntry(NotificationEntry entry) {