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

Commit c307591a authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge "Remove option to set barrier layer by surface"

parents ebb701a9 03112d7b

core/java/android/view/SurfaceControl.java

+0 −19
Original line number Diff line number Diff line
@@ -182,9 +182,6 @@ public final class SurfaceControl implements Parcelable { 
            IBinder displayToken, int mode);

    private static native void nativeDeferTransactionUntil(long transactionObj, long nativeObject,

            long barrierObject, long frame);

    private static native void nativeDeferTransactionUntilSurface(long transactionObj,

            long nativeObject,

            long surfaceObject, long frame);

    private static native void nativeReparentChildren(long transactionObj, long nativeObject,

            long newParentObject);

    private static native void nativeReparent(long transactionObj, long nativeObject,
@@ -2944,22 +2941,6 @@ public final class SurfaceControl implements Parcelable { 
            return this;

        }



        /**

         * @hide

         */

        @Deprecated

        @UnsupportedAppUsage

        public Transaction deferTransactionUntilSurface(SurfaceControl sc, Surface barrierSurface,

                long frameNumber) {

            if (frameNumber < 0) {

                return this;

            }

            checkPreconditions(sc);

            nativeDeferTransactionUntilSurface(mNativeObject, sc.mNativeObject,

                    barrierSurface.mNativeObject, frameNumber);

            return this;

        }



        /**

         * @hide

         */

core/jni/android_view_SurfaceControl.cpp

+0 −13
Original line number Diff line number Diff line
@@ -1333,17 +1333,6 @@ static void nativeDeferTransactionUntil(JNIEnv* env, jclass clazz, jlong transac 
    transaction->deferTransactionUntil_legacy(ctrl, barrier, frameNumber);

}



static void nativeDeferTransactionUntilSurface(JNIEnv* env, jclass clazz, jlong transactionObj,

        jlong nativeObject,

        jlong surfaceObject, jlong frameNumber) {

    auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);



    auto ctrl = reinterpret_cast<SurfaceControl *>(nativeObject);

    sp<Surface> barrier = reinterpret_cast<Surface *>(surfaceObject);



    transaction->deferTransactionUntil_legacy(ctrl, barrier, frameNumber);

}



static void nativeReparentChildren(JNIEnv* env, jclass clazz, jlong transactionObj,

        jlong nativeObject,

        jlong newParentObject) {
@@ -1699,8 +1688,6 @@ static const JNINativeMethod sSurfaceControlMethods[] = { 
            (void*)nativeGetProtectedContentSupport },

    {"nativeDeferTransactionUntil", "(JJJJ)V",

            (void*)nativeDeferTransactionUntil },

    {"nativeDeferTransactionUntilSurface", "(JJJJ)V",

            (void*)nativeDeferTransactionUntilSurface },

    {"nativeReparentChildren", "(JJJ)V",

            (void*)nativeReparentChildren } ,

    {"nativeReparent", "(JJJ)V",

services/tests/wmtests/src/com/android/server/wm/StubTransaction.java

+0 −7
Original line number Diff line number Diff line
@@ -146,13 +146,6 @@ public class StubTransaction extends SurfaceControl.Transaction { 
        return this;

    }



    @Override

    public SurfaceControl.Transaction deferTransactionUntilSurface(SurfaceControl sc,

            Surface barrierSurface,

            long frameNumber) {

        return this;

    }



    @Override

    public SurfaceControl.Transaction reparentChildren(SurfaceControl sc,

            SurfaceControl newParent) {