Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fc14350 authored by Pechetty Sravani (xWF)'s avatar Pechetty Sravani (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Improve SurfaceControlRegistry missing callers when IPC" 

This reverts commit be1e4e42.

Reason for revert: <Droidmonitor created revert due to b/418880166.Will be verified through ABTD for standard investigation.>

Bug: 418880166
Change-Id: I3957a0196bf734f023678c9ae3717cc32482cb50
parent be1e4e42

core/java/android/view/SurfaceControl.java

+5 −18
Original line number Diff line number Diff line
@@ -3121,19 +3121,11 @@ public final class SurfaceControl implements Parcelable { 
            mNativeObject = nativeObject;

            mFreeNativeResources = sRegistry.registerNativeAllocation(this, mNativeObject);

            setUpForSurfaceControlRegistry();

            if (SurfaceControlRegistry.sCallStackDebuggingEnabled) {

                SurfaceControlRegistry.getProcessInstance().checkCallStackDebugging(

                        "ctor", this, null, null);

            }

        }



        private Transaction(Parcel in) {

            setUpForSurfaceControlRegistry();

            readFromParcel(in);

            if (SurfaceControlRegistry.sCallStackDebuggingEnabled) {

                SurfaceControlRegistry.getProcessInstance().checkCallStackDebugging(

                        "ctor", this, null, null);

            }

            setUpForSurfaceControlRegistry();

        }



        /**
@@ -3146,6 +3138,10 @@ public final class SurfaceControl implements Parcelable { 
            mCalls = SurfaceControlRegistry.sLogAllTxCallsOnApply

                    ? new ArrayList<>()

                    : null;

            if (SurfaceControlRegistry.sCallStackDebuggingEnabled) {

                SurfaceControlRegistry.getProcessInstance().checkCallStackDebugging(

                        "ctor", this, null, null);

            }

        }



        /**
@@ -5405,12 +5401,6 @@ public final class SurfaceControl implements Parcelable { 


            dest.writeInt(1);

            nativeWriteTransactionToParcel(mNativeObject, dest);

            if (mCalls != null) {

                dest.writeInt(1);

                dest.writeStringList(mCalls);

            } else {

                dest.writeInt(0);

            }

            if ((flags & Parcelable.PARCELABLE_WRITE_RETURN_VALUE) != 0) {

                nativeClearTransaction(mNativeObject);

            }
@@ -5420,9 +5410,6 @@ public final class SurfaceControl implements Parcelable { 
            mNativeObject = 0;

            if (in.readInt() != 0) {

                mNativeObject = nativeReadTransactionFromParcel(in);

                if (in.readInt() != 0) {

                    in.readStringList(mCalls);

                }

                mFreeNativeResources = sRegistry.registerNativeAllocation(this, mNativeObject);

            }

        }