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

Commit aeab1b82 authored by Vishnu Nair's avatar Vishnu Nair
Browse files

SF: Remove setFinalCrop impl 1/2 

setFinalCrop functionality is reimplemented by creating a new bounds layer
and applying a crop on this layer. see ag/4625718

Test: go/wm-smoke

Change-Id: I3ffb6dc2e2afd5170f6c6dee9e928ed0600656b1
parent c8344a19

config/boot-image-profile.txt

+0 −1
Original line number Diff line number Diff line
@@ -6645,7 +6645,6 @@ HPLandroid/view/SurfaceControl$Transaction;->reparentChildren(Landroid/view/Surf 
HPLandroid/view/SurfaceControl$Transaction;->setAnimationTransaction()Landroid/view/SurfaceControl$Transaction;

HPLandroid/view/SurfaceControl$Transaction;->setColor(Landroid/view/SurfaceControl;[F)Landroid/view/SurfaceControl$Transaction;

HPLandroid/view/SurfaceControl$Transaction;->setEarlyWakeup()Landroid/view/SurfaceControl$Transaction;

HPLandroid/view/SurfaceControl$Transaction;->setFinalCrop(Landroid/view/SurfaceControl;Landroid/graphics/Rect;)Landroid/view/SurfaceControl$Transaction;

HPLandroid/view/SurfaceControl$Transaction;->setGeometryAppliesWithResize(Landroid/view/SurfaceControl;)Landroid/view/SurfaceControl$Transaction;

HPLandroid/view/SurfaceControl$Transaction;->setMatrix(Landroid/view/SurfaceControl;Landroid/graphics/Matrix;[F)Landroid/view/SurfaceControl$Transaction;

HPLandroid/view/SurfaceControl$Transaction;->setOpaque(Landroid/view/SurfaceControl;Z)Landroid/view/SurfaceControl$Transaction;

core/java/android/view/SurfaceControl.java

+0 −21
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ public class SurfaceControl implements Parcelable { 
            int flags, int mask);

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

            int l, int t, int r, int b);

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

            int l, int t, int r, int b);

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

            int layerStack);
@@ -961,13 +959,6 @@ public class SurfaceControl implements Parcelable { 
        }

    }



    public void setFinalCrop(Rect crop) {

        checkNotReleased();

        synchronized (SurfaceControl.class) {

            sGlobalTransaction.setFinalCrop(this, crop);

        }

    }



    public void setLayerStack(int layerStack) {

        checkNotReleased();

        synchronized(SurfaceControl.class) {
@@ -1521,18 +1512,6 @@ public class SurfaceControl implements Parcelable { 
        }



        @UnsupportedAppUsage

        public Transaction setFinalCrop(SurfaceControl sc, Rect crop) {

            sc.checkNotReleased();

            if (crop != null) {

                nativeSetFinalCrop(mNativeObject, sc.mNativeObject,

                        crop.left, crop.top, crop.right, crop.bottom);

            } else {

                nativeSetFinalCrop(mNativeObject, sc.mNativeObject, 0, 0, 0, 0);

            }



            return this;

        }



        public Transaction setLayerStack(SurfaceControl sc, int layerStack) {

            sc.checkNotReleased();

            nativeSetLayerStack(mNativeObject, sc.mNativeObject, layerStack);

core/java/android/view/SurfaceView.java

+0 −6
Original line number Diff line number Diff line
@@ -1167,12 +1167,6 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb 
            mBackgroundControl.setWindowCrop(crop);

        }



        @Override

        public void setFinalCrop(Rect crop) {

            super.setFinalCrop(crop);

            mBackgroundControl.setFinalCrop(crop);

        }



        @Override

        public void setLayerStack(int layerStack) {

            super.setLayerStack(layerStack);

core/jni/android_view_SurfaceControl.cpp

+0 −12
Original line number Diff line number Diff line
@@ -449,16 +449,6 @@ static void nativeSetWindowCrop(JNIEnv* env, jclass clazz, jlong transactionObj, 
    transaction->setCrop_legacy(ctrl, crop);

}



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

        jlong nativeObject,

        jint l, jint t, jint r, jint b) {

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



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

    Rect crop(l, t, r, b);

    transaction->setFinalCrop_legacy(ctrl, crop);

}



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

        jlong nativeObject, jint layerStack) {

    auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);
@@ -967,8 +957,6 @@ static const JNINativeMethod sSurfaceControlMethods[] = { 
            (void*)nativeSetFlags },

    {"nativeSetWindowCrop", "(JJIIII)V",

            (void*)nativeSetWindowCrop },

    {"nativeSetFinalCrop", "(JJIIII)V",

            (void*)nativeSetFinalCrop },

    {"nativeSetLayerStack", "(JJI)V",

            (void*)nativeSetLayerStack },

    {"nativeGetBuiltInDisplay", "(I)Landroid/os/IBinder;",

packages/SystemUI/shared/src/com/android/systemui/shared/system/TransactionCompat.java

+0 −5
Original line number Diff line number Diff line
@@ -83,11 +83,6 @@ public class TransactionCompat { 
        return this;

    }



    public TransactionCompat setFinalCrop(SurfaceControlCompat surfaceControl, Rect crop) {

        mTransaction.setFinalCrop(surfaceControl.mSurfaceControl, crop);

        return this;

    }



    public TransactionCompat deferTransactionUntil(SurfaceControlCompat surfaceControl,

            IBinder handle, long frameNumber) {

        mTransaction.deferTransactionUntil(surfaceControl.mSurfaceControl, handle, frameNumber);