summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author András Kurucz <kurucz@google.com> 2024-10-24 15:44:13 +0000
committer András Kurucz <kurucz@google.com> 2024-10-29 18:41:19 +0000
commit103304543e80fc8aadb99533beaa429788cda4aa (patch)
tree316b9a2956868ae303711f9bb1228dd201056c03
parent665593ae3a8c303202f97ffa0b38562d65113115 (diff)
[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
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java4
1 files changed, 4 insertions, 0 deletions
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;
}
}