Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Changed reparentChild method name to reparent."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-21 01:04:06 +00:00
committed by Android (Google) Code Review
parent 50ef8bb213 7643140c7c
commit e551ca7751
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/SurfaceControl.java
View File

@@ -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() {

12
core/jni/android_view_SurfaceControl.cpp
View File

@@ -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",