Merge "Revert "[flexiglass] Verify that NSSL#mContentHeight is not accessed"" into main (0b7fa745) · Commits · e / os / android_frameworks_base

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -6953,12 +6953,10 @@ public class NotificationStackScrollLayout

		/** Use {@link ScrollViewFields#intrinsicStackHeight}, when SceneContainerFlag is enabled. */
		private int getContentHeight() {
		SceneContainerFlag.assertInLegacyMode();
		return mContentHeight;
		}

		private void setContentHeight(int contentHeight) {
		SceneContainerFlag.assertInLegacyMode();
		mContentHeight = contentHeight;
		}

		@@ -6967,12 +6965,10 @@ public class NotificationStackScrollLayout
		* @return the height of the content ignoring the footer.
		*/
		public float getIntrinsicContentHeight() {
		SceneContainerFlag.assertInLegacyMode();
		return mIntrinsicContentHeight;
		}

		private void setIntrinsicContentHeight(float intrinsicContentHeight) {
		SceneContainerFlag.assertInLegacyMode();
		mIntrinsicContentHeight = intrinsicContentHeight;
		}
		}