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

Commit 612ad2bf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow extending the SurfacePackage lifetime" into sc-dev am: 25546c38 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13816989

Change-Id: Icdbe32e9db7cd1a5c6c0d0938f217657adc80ba7
parents 8f653ede 25546c38

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -48107,6 +48107,7 @@ package android.view { 
  }

  }

















  public static final class SurfaceControlViewHost.SurfacePackage implements android.os.Parcelable {







  public static final class SurfaceControlViewHost.SurfacePackage implements android.os.Parcelable {














    ctor public SurfaceControlViewHost.SurfacePackage(@NonNull android.view.SurfaceControlViewHost.SurfacePackage);











    method public int describeContents();







    method public int describeContents();











    method public void release();







    method public void release();











    method public void writeToParcel(@NonNull android.os.Parcel, int);







    method public void writeToParcel(@NonNull android.os.Parcel, int);

























core/java/android/view/SurfaceControlViewHost.java



+20
−0




























Original line number
Original line
Diff line number
Diff line








@@ -79,6 +79,26 @@ public class SurfaceControlViewHost {









            mInputToken = inputToken;







            mInputToken = inputToken;











        }







        }


































        /**














         * Constructs a copy of {@code SurfacePackage} with an independent lifetime.














         *














         * The caller can use this to create an independent copy in situations where ownership of














         * the {@code SurfacePackage} would be transferred elsewhere, such as attaching to a














         * {@code SurfaceView}, returning as {@code Binder} result value, etc. The caller is














         * responsible for releasing this copy when its done.














         *














         * @param other {@code SurfacePackage} to create a copy of.














         */














        public SurfacePackage(@NonNull SurfacePackage other) {














            SurfaceControl otherSurfaceControl = other.mSurfaceControl;














            if (otherSurfaceControl != null && otherSurfaceControl.isValid()) {














                mSurfaceControl = new SurfaceControl();














                mSurfaceControl.copyFrom(otherSurfaceControl, "SurfacePackage");














            }














            mAccessibilityEmbeddedConnection = other.mAccessibilityEmbeddedConnection;














            mInputToken = other.mInputToken;














        }


























        private SurfacePackage(Parcel in) {







        private SurfacePackage(Parcel in) {











            mSurfaceControl = new SurfaceControl();







            mSurfaceControl = new SurfaceControl();











            mSurfaceControl.readFromParcel(in);







            mSurfaceControl.readFromParcel(in);