commit 7643140c7cbf9290a73dca794b450c46fcbea2a4
author chaviw <chaviw@google.com> Mon Sep 18 16:50:05 2017 -0700
committer Jorim Jaggi <jjaggi@google.com> Wed Sep 20 17:35:43 2017 +0200
tree 6d6f0e3059d79edffc4290469811e885c721fb96
parent 6dd80e7d832fc984b874010b9014ea7ff78581ea

Changed reparentChild method name to reparent.

The native reparentChild was changed to reparent to represent that the
current layer is getting re-parented. Updated the jni and Java code to
reflect that.

Test: Device boots

Change-Id: I390d2efba61c626f2162f75f650700d53ab178a5

core/java/android/view/SurfaceControl.java

diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index 91932dd..7198f37 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -105,8 +105,8 @@
             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 @@
         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

diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index 33f1c7d..bf8bbf5 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -736,13 +736,11 @@
     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 @@
             (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",