Merge "Fix ZOrderingTest got NPE during display creation." (662547a8) · Commits · e / os / android_frameworks_base

services/tests/servicestests/src/com/android/server/wm/ZOrderingTests.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}