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

Commit 68256524 authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge "SurfaceControl: Query native object for transform hint" into sc-dev am: 07576112 

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

Change-Id: I5830ac71715a1b5c6a32033a2641ca91323be20d
parents e78ff66a 07576112

core/java/android/view/SurfaceControl.java

+4 −8
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ public final class SurfaceControl implements Parcelable { 
    private static native long nativeCreateJankDataListenerWrapper(OnJankDataListener listener);

    private static native int nativeGetGPUContextPriority();

    private static native void nativeSetTransformHint(long nativeObject, int transformHint);

    private static native int nativeGetTransformHint(long nativeObject);



    @Nullable

    @GuardedBy("mLock")
@@ -619,7 +620,6 @@ public final class SurfaceControl implements Parcelable { 
        mName = other.mName;

        mWidth = other.mWidth;

        mHeight = other.mHeight;

        mTransformHint = other.mTransformHint;

        mLocalOwnerView = other.mLocalOwnerView;

        assignNativeObject(nativeCopyFromSurfaceControl(other.mNativeObject), callsite);

    }
@@ -1482,7 +1482,6 @@ public final class SurfaceControl implements Parcelable { 
        mName = in.readString8();

        mWidth = in.readInt();

        mHeight = in.readInt();

        mTransformHint = in.readInt();



        long object = 0;

        if (in.readInt() != 0) {
@@ -1501,7 +1500,6 @@ public final class SurfaceControl implements Parcelable { 
        dest.writeString8(mName);

        dest.writeInt(mWidth);

        dest.writeInt(mHeight);

        dest.writeInt(mTransformHint);

        if (mNativeObject == 0) {

            dest.writeInt(0);

        } else {
@@ -3625,7 +3623,8 @@ public final class SurfaceControl implements Parcelable { 
     * @hide

     */

    public int getTransformHint() {

        return mTransformHint;

        checkNotReleased();

        return nativeGetTransformHint(mNativeObject);

    }



    /**
@@ -3638,9 +3637,6 @@ public final class SurfaceControl implements Parcelable { 
     * @hide

     */

    public void setTransformHint(@Surface.Rotation int transformHint) {

        if (mTransformHint != transformHint) {

            mTransformHint = transformHint;

        nativeSetTransformHint(mNativeObject, transformHint);

    }

}
 
}

core/jni/android_view_SurfaceControl.cpp

+10 −0
Original line number Diff line number Diff line
@@ -1798,6 +1798,14 @@ static void nativeSetTransformHint(JNIEnv* env, jclass clazz, jlong nativeSurfac 
            ui::Transform::toRotationFlags(static_cast<ui::Rotation>(transformHint)));

}



static jint nativeGetTransformHint(JNIEnv* env, jclass clazz, jlong nativeSurfaceControl) {

    sp<SurfaceControl> surface(reinterpret_cast<SurfaceControl*>(nativeSurfaceControl));

    ui::Transform::RotationFlags transformHintRotationFlags =

            static_cast<ui::Transform::RotationFlags>(surface->getTransformHint());



    return toRotationInt(ui::Transform::toRotation((transformHintRotationFlags)));

}



// ----------------------------------------------------------------------------



static const JNINativeMethod sSurfaceControlMethods[] = {
@@ -1989,6 +1997,8 @@ static const JNINativeMethod sSurfaceControlMethods[] = { 
            (void*)nativeGetGPUContextPriority },

    {"nativeSetTransformHint", "(JI)V",

            (void*)nativeSetTransformHint },

    {"nativeGetTransformHint", "(J)I",

            (void*)nativeGetTransformHint },

        // clang-format on

};