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

Commit e551ca77 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Changed reparentChild method name to reparent."

parents 50ef8bb2 7643140c

core/java/android/view/SurfaceControl.java

+5 −5
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ public class SurfaceControl { 
            long surfaceObject, long frame);

    private static native void nativeReparentChildren(long nativeObject,

            IBinder handle);

    private static native void nativeReparentChild(long nativeObject,

            IBinder parentHandle, IBinder childHandle);

    private static native void nativeReparent(long nativeObject,

            IBinder parentHandle);

    private static native void nativeSeverChildren(long nativeObject);

    private static native void nativeSetOverrideScalingMode(long nativeObject,

            int scalingMode);
@@ -455,9 +455,9 @@ public class SurfaceControl { 
        nativeReparentChildren(mNativeObject, newParentHandle);

    }



    /** Re-parents a specific child layer to a new parent */

    public void reparentChild(IBinder newParentHandle, IBinder childHandle) {

        nativeReparentChild(mNativeObject, newParentHandle, childHandle);

    /** Re-parents this layer to a new parent. */

    public void reparent(IBinder newParentHandle) {

        nativeReparent(mNativeObject, newParentHandle);

    }



    public void detachChildren() {

core/jni/android_view_SurfaceControl.cpp

+5 −7
Original line number Diff line number Diff line
@@ -736,13 +736,11 @@ static void nativeReparentChildren(JNIEnv* env, jclass clazz, jlong nativeObject 
    ctrl->reparentChildren(handle);

}



static void nativeReparentChild(JNIEnv* env, jclass clazz, jlong nativeObject,

        jobject newParentObject, jobject childObject) {

static void nativeReparent(JNIEnv* env, jclass clazz, jlong nativeObject,

        jobject newParentObject) {

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

    sp<IBinder> parentHandle = ibinderForJavaObject(env, newParentObject);

    sp<IBinder> childHandle = ibinderForJavaObject(env, childObject);



    ctrl->reparentChild(parentHandle, childHandle);

    ctrl->reparent(parentHandle);

}



static void nativeSeverChildren(JNIEnv* env, jclass clazz, jlong nativeObject) {
@@ -868,8 +866,8 @@ static const JNINativeMethod sSurfaceControlMethods[] = { 
            (void*)nativeDeferTransactionUntilSurface },

    {"nativeReparentChildren", "(JLandroid/os/IBinder;)V",

            (void*)nativeReparentChildren } ,

    {"nativeReparentChild", "(JLandroid/os/IBinder;Landroid/os/IBinder;)V",

            (void*)nativeReparentChild },

    {"nativeReparent", "(JLandroid/os/IBinder;)V",

            (void*)nativeReparent },

    {"nativeSeverChildren", "(J)V",

            (void*)nativeSeverChildren } ,

    {"nativeSetOverrideScalingMode", "(JI)V",