diff options
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 4 | ||||
| -rw-r--r-- | core/java/android/view/SurfaceControl.java | 2 | ||||
| -rw-r--r-- | core/jni/android_view_SurfaceControl.cpp | 10 |
3 files changed, 0 insertions, 16 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index dae4570456cd..814800bcd9e5 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -615,10 +615,6 @@ void BootAnimation::resizeSurface(int newWidth, int newHeight) { mWidth = limitedSize.width; mHeight = limitedSize.height; - SurfaceComposerClient::Transaction t; - t.setSize(mFlingerSurfaceControl, mWidth, mHeight); - t.apply(); - EGLConfig config = getEglConfig(mDisplay); EGLSurface surface = eglCreateWindowSurface(mDisplay, config, mFlingerSurface.get(), nullptr); if (eglMakeCurrent(mDisplay, surface, surface, mContext) == EGL_FALSE) { diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 84f04c12cf51..c4532621ee07 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -130,7 +130,6 @@ public final class SurfaceControl implements Parcelable { float x, float y); private static native void nativeSetScale(long transactionObj, long nativeObject, float x, float y); - private static native void nativeSetSize(long transactionObj, long nativeObject, int w, int h); private static native void nativeSetTransparentRegionHint(long transactionObj, long nativeObject, Region region); private static native void nativeSetAlpha(long transactionObj, long nativeObject, float alpha); @@ -2954,7 +2953,6 @@ public final class SurfaceControl implements Parcelable { @IntRange(from = 0) int w, @IntRange(from = 0) int h) { checkPreconditions(sc); mResizedSurfaces.put(sc, new Point(w, h)); - nativeSetSize(mNativeObject, sc.mNativeObject, w, h); return this; } diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index 9ae16304b6c8..ffd32d8f405a 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -820,14 +820,6 @@ static void nativeSetStretchEffect(JNIEnv* env, jclass clazz, jlong transactionO transaction->setStretchEffect(ctrl, stretch); } -static void nativeSetSize(JNIEnv* env, jclass clazz, jlong transactionObj, - jlong nativeObject, jint w, jint h) { - auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj); - - SurfaceControl* const ctrl = reinterpret_cast<SurfaceControl *>(nativeObject); - transaction->setSize(ctrl, w, h); -} - static void nativeSetFlags(JNIEnv* env, jclass clazz, jlong transactionObj, jlong nativeObject, jint flags, jint mask) { auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj); @@ -2163,8 +2155,6 @@ static const JNINativeMethod sSurfaceControlMethods[] = { (void*)nativeSetPosition }, {"nativeSetScale", "(JJFF)V", (void*)nativeSetScale }, - {"nativeSetSize", "(JJII)V", - (void*)nativeSetSize }, {"nativeSetTransparentRegionHint", "(JJLandroid/graphics/Region;)V", (void*)nativeSetTransparentRegionHint }, {"nativeSetDamageRegion", "(JJLandroid/graphics/Region;)V", |