Merge "Fix NPE in MessagingMessage" into main (e864831b) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/MessagingMessage.java

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -105,7 +105,10 @@ public interface MessagingMessage extends MessagingLinearLayout.MessagingChild {
	}		}

	default void removeMessage(ArrayList<MessagingLinearLayout.MessagingChild> toRecycle) {		default void removeMessage(ArrayList<MessagingLinearLayout.MessagingChild> toRecycle) {
	getGroup().removeMessage(this, toRecycle);		final MessagingGroup group = getGroup();
			if (group != null) {
			group.removeMessage(this, toRecycle);
			}
	}		}

	default void setMessagingGroup(MessagingGroup group) {		default void setMessagingGroup(MessagingGroup group) {
	@@ -132,7 +135,12 @@ public interface MessagingMessage extends MessagingLinearLayout.MessagingChild {
	@Override		@Override
	default void hideAnimated() {		default void hideAnimated() {
	setIsHidingAnimated(true);		setIsHidingAnimated(true);
	getGroup().performRemoveAnimation(getView(), () -> setIsHidingAnimated(false));		final MessagingGroup group = getGroup();
			if (group != null) {
			group.performRemoveAnimation(getView(), () -> setIsHidingAnimated(false));
			} else {
			setIsHidingAnimated(false);
			}
	}		}

	default boolean hasOverlappingRendering() {		default boolean hasOverlappingRendering() {