Merge "Fix ZOrderingTest got NPE during display creation."

1 files changed, 0 insertions, 2 deletions

diff --git a/services/tests/servicestests/src/com/android/server/wm/ZOrderingTests.java b/services/tests/servicestests/src/com/android/server/wm/ZOrderingTests.java
index 32e4e0265193..3c8ae3cecad6 100644
--- a/services/tests/servicestests/src/com/android/server/wm/ZOrderingTests.java
+++ b/services/tests/servicestests/src/com/android/server/wm/ZOrderingTests.java
@@ -122,7 +122,6 @@ public class ZOrderingTests extends WindowTestsBase {
         public SurfaceControl build() {
             final SurfaceControl sc = super.build();
             mTransaction.addParentFor(sc, mPendingParent);
-            mTransaction = null;
             mPendingParent = null;
             return sc;
         }
@@ -138,7 +137,6 @@ public class ZOrderingTests extends WindowTestsBase {
         @Override
         public SurfaceControl.Builder make(SurfaceSession s) {
             final LayerRecordingTransaction transaction = mTransaction;
-            mTransaction = null;
             return new HierarchyRecorder(s, transaction);
         }
     }