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

Commit 8c5bfc18 authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

Merge "SurfacePackage: Add release method" into rvc-dev am: 4841efcf

Change-Id: I92a58a351c221d07201ce1f66e51852a7f11cffd
parents 649059af 4841efcf
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -53620,6 +53620,7 @@ package android.view {
  public static final class SurfaceControlViewHost.SurfacePackage implements android.os.Parcelable {
    method public int describeContents();
    method public void release();
    method public void writeToParcel(@NonNull android.os.Parcel, int);
    field @NonNull public static final android.os.Parcelable.Creator<android.view.SurfaceControlViewHost.SurfacePackage> CREATOR;
  }
+11 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class SurfaceControlViewHost {
     * a SurfaceView by calling {@link SurfaceView#setChildSurfacePackage}.
     */
    public static final class SurfacePackage implements Parcelable {
        private final SurfaceControl mSurfaceControl;
        private SurfaceControl mSurfaceControl;
        private final IAccessibilityEmbeddedConnection mAccessibilityEmbeddedConnection;

        SurfacePackage(SurfaceControl sc, IAccessibilityEmbeddedConnection connection) {
@@ -97,6 +97,16 @@ public class SurfaceControlViewHost {
            out.writeStrongBinder(mAccessibilityEmbeddedConnection.asBinder());
        }

        /**
         * Release the SurfaceControl associated with the SurfacePackage.
         */
        public void release() {
            if (mSurfaceControl != null) {
                mSurfaceControl.release();
             }
             mSurfaceControl = null;
        }

        public static final @NonNull Creator<SurfacePackage> CREATOR
             = new Creator<SurfacePackage>() {
                     public SurfacePackage createFromParcel(Parcel in) {