From 103304543e80fc8aadb99533beaa429788cda4aa Mon Sep 17 00:00:00 2001
From: András Kurucz <kurucz@google.com>
Date: Thu, 24 Oct 2024 15:44:13 +0000
Subject: [flexiglass] Verify that NSSL#mContentHeight is not accessed

NSSL#mContentHeight is replaced by ScrollViewFields#.intrinsicStackHeight when flexiglass is enabled.

Bug: 296118689
Fixes: 376018224
Test: run sysui with, and without flexiglass
Flag: EXEMPT mechanical refactor
Change-Id: I48f03b642c5061731434faae843a51ae1e954220
---
 .../statusbar/notification/stack/NotificationStackScrollLayout.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index 94968c5a91cc..1eac4171bdc5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -6957,10 +6957,12 @@ 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;
     }
 
@@ -6969,10 +6971,12 @@ 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;
     }
 }
-- 
cgit v1.2.3-59-g8ed1b