Merge "Create/rename methods to track entryadapter usage" into main (bf3a26b3) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationRemoteInputManagerTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,7 @@ public class NotificationRemoteInputManagerTest extends SysuiTestCase {
		if (NotificationBundleUi.isEnabled()) {
		return row.getEntryAdapter().getSbn().getNotification();
		} else {
		return row.getEntry().getSbn().getNotification();
		return row.getEntryLegacy().getSbn().getNotification();
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ public final class NotificationGroupTestHelper {
		ExpandableNotificationRow row = mock(ExpandableNotificationRow.class);
		entry.setRow(row);
		when(row.getEntry()).thenReturn(entry);
		when(row.getEntryLegacy()).thenReturn(entry);
		return entry;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -894,8 +894,8 @@ public class SwipeHelper implements Gefingerpoken, Dumpable {
		if (NotificationBundleUi.isEnabled()) {
		return enr.getEntryAdapter().canDragAndDrop();
		} else {
		boolean canBubble = enr.getEntry().canBubble();
		Notification notif = enr.getEntry().getSbn().getNotification();
		boolean canBubble = enr.getEntryLegacy().canBubble();
		Notification notif = enr.getEntryLegacy().getSbn().getNotification();
		PendingIntent dragIntent = notif.contentIntent != null ? notif.contentIntent
		: notif.fullScreenIntent;
		if (dragIntent != null && dragIntent.isActivity() && !canBubble) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -394,7 +394,7 @@ constructor(
		// Only drag down on sensitive views, otherwise the ExpandHelper will take this
		return if (NotificationBundleUi.isEnabled)
		view.entryAdapter?.isSensitive?.value == true
		else view.entry.isSensitive.value
		else view.entryLegacy.isSensitive.value
		}
		}
		return false
		@@ -569,7 +569,7 @@ constructor(
		if (NotificationBundleUi.isEnabled) {
		userId = expandView.entryAdapter?.sbn?.userId!!
		} else {
		userId = expandView.entry.sbn.userId
		userId = expandView.entryLegacy.sbn.userId
		}
		}
		var fullShadeNeedsBouncer =

+3 −3

Original line number	Diff line number	Diff line
		@@ -169,7 +169,7 @@ public class NotificationRemoteInputManager implements CoreStartable {
		if (NotificationBundleUi.isEnabled()) {
		releaseNotificationIfKeptForRemoteInputHistory(row.getEntryAdapter());
		} else {
		releaseNotificationIfKeptForRemoteInputHistory(row.getEntry());
		releaseNotificationIfKeptForRemoteInputHistory(row.getEntryLegacy());
		}
		}
		return started;
		@@ -189,8 +189,8 @@ public class NotificationRemoteInputManager implements CoreStartable {
		statusBarNotification = row.getEntryAdapter().getSbn();
		}
		} else {
		if (row.getEntry() != null) {
		statusBarNotification = row.getEntry().getSbn();
		if (row.getEntryLegacy() != null) {
		statusBarNotification = row.getEntryLegacy().getSbn();
		}
		}
		if (statusBarNotification == null) {