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

Commit 5aec7b90 authored by Wonsik Kim's avatar Wonsik Kim
Browse files

Revert "Modify SurfaceView to use SurfaceFlinger child surfaces." 

This reverts commit cd4aeef8.

Bug: 36027342
Bug: 36015884
Change-Id: Ifd5b69caf64d65a8cd6570b7fe1fb6abe90e30b8
parent a8516644

core/java/android/view/SurfaceControl.java

+1 −22
Original line number Diff line number Diff line
@@ -95,11 +95,6 @@ public class SurfaceControl { 
            IBinder displayToken, int mode);

    private static native void nativeDeferTransactionUntil(long nativeObject,

            IBinder handle, long frame);

    private static native void nativeDeferTransactionUntilSurface(long nativeObject,

            long surfaceObject, long frame);

    private static native void nativeReparentChildren(long nativeObject,

            IBinder handle);

    private static native void nativeSeverChildren(long nativeObject);

    private static native void nativeSetOverrideScalingMode(long nativeObject,

            int scalingMode);

    private static native IBinder nativeGetHandle(long nativeObject);
@@ -423,24 +418,8 @@ public class SurfaceControl { 
    }



    public void deferTransactionUntil(IBinder handle, long frame) {

        if (frame > 0) {

        nativeDeferTransactionUntil(mNativeObject, handle, frame);

    }

    }



    public void deferTransactionUntil(Surface barrier, long frame) {

        if (frame > 0) {

            nativeDeferTransactionUntilSurface(mNativeObject, barrier.mNativeObject, frame);

        }

    }



    public void reparentChildren(IBinder newParentHandle) {

        nativeReparentChildren(mNativeObject, newParentHandle);

    }



    public void detachChildren() {

        nativeSeverChildren(mNativeObject);

    }



    public void setOverrideScalingMode(int scalingMode) {

        checkNotReleased();

core/java/android/view/SurfaceSession.java

+0 −5
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ public final class SurfaceSession { 
    private long mNativeClient; // SurfaceComposerClient*



    private static native long nativeCreate();

    private static native long nativeCreateScoped(long surfacePtr);

    private static native void nativeDestroy(long ptr);

    private static native void nativeKill(long ptr);
@@ -36,10 +35,6 @@ public final class SurfaceSession { 
        mNativeClient = nativeCreate();

    }



    public SurfaceSession(Surface root) {

        mNativeClient = nativeCreateScoped(root.mNativeObject);

    }



    /* no user serviceable parts here ... */

    @Override

    protected void finalize() throws Throwable {