Merge "Fix null checks in isInVisibleLocation." into tm-qpr-dev (87126479) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -827,18 +827,16 @@ public class NotificationStackScrollLayoutController {

		private boolean isInVisibleLocation(NotificationEntry entry) {
		ExpandableNotificationRow row = entry.getRow();
		ExpandableViewState childViewState = row.getViewState();

		if (childViewState == null) {
		if (row == null) {
		return false;
		}

		ExpandableViewState childViewState = row.getViewState();
		if ((childViewState.location & ExpandableViewState.VISIBLE_LOCATIONS) == 0) {
		return false;
		}
		if (row.getVisibility() != View.VISIBLE) {
		return false;
		}
		return true;

		return row.getVisibility() == View.VISIBLE;
		}

		public boolean isViewAffectedBySwipe(ExpandableView expandableView) {