Fix equals computaiton for layer
The parent <-> children relationship on equals is causing a stack overflow in KotlinJS
Test: test FlickerLibTest
Change-Id: Iec580a7e1b00760b89d460d27295e4d63dfa8485
diff --git a/libraries/flicker/src/com/android/server/wm/traces/common/layers/Layer.kt b/libraries/flicker/src/com/android/server/wm/traces/common/layers/Layer.kt
index 2e3844b..56d8a86 100644
--- a/libraries/flicker/src/com/android/server/wm/traces/common/layers/Layer.kt
+++ b/libraries/flicker/src/com/android/server/wm/traces/common/layers/Layer.kt
@@ -232,7 +232,6 @@
if (z != other.z) return false
if (currFrame != other.currFrame) return false
if (stableId != other.stableId) return false
- if (parent != other.parent) return false
if (zOrderRelativeOf != other.zOrderRelativeOf) return false
if (zOrderRelativeParentOf != other.zOrderRelativeParentOf) return false
if (_children != other._children) return false
@@ -240,6 +239,33 @@
if (_partiallyOccludedBy != other._partiallyOccludedBy) return false
if (_coveredBy != other._coveredBy) return false
if (isMissing != other.isMissing) return false
+ if (visibleRegion != other.visibleRegion) return false
+ if (activeBuffer != other.activeBuffer) return false
+ if (flags != other.flags) return false
+ if (bounds != other.bounds) return false
+ if (color != other.color) return false
+ if (shadowRadius != other.shadowRadius) return false
+ if (cornerRadius != other.cornerRadius) return false
+ if (type != other.type) return false
+ if (transform != other.transform) return false
+ if (sourceBounds != other.sourceBounds) return false
+ if (effectiveScalingMode != other.effectiveScalingMode) return false
+ if (bufferTransform != other.bufferTransform) return false
+ if (hwcCompositionType != other.hwcCompositionType) return false
+ if (hwcCrop != other.hwcCrop) return false
+ if (hwcFrame != other.hwcFrame) return false
+ if (backgroundBlurRadius != other.backgroundBlurRadius) return false
+ if (crop != other.crop) return false
+ if (isRelativeOf != other.isRelativeOf) return false
+ if (zOrderRelativeOfId != other.zOrderRelativeOfId) return false
+ if (stackId != other.stackId) return false
+ if (requestedTransform != other.requestedTransform) return false
+ if (requestedColor != other.requestedColor) return false
+ if (cornerRadiusCrop != other.cornerRadiusCrop) return false
+ if (inputTransform != other.inputTransform) return false
+ if (inputRegion != other.inputRegion) return false
+ if (screenBounds != other.screenBounds) return false
+ if (isOpaque != other.isOpaque) return false
return true
}
