Merge "SurfaceComposerClient: Remove setSize"
This commit is contained in:
@@ -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) {
|
||||
|
||||
@@ -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);
|
||||
@@ -2973,7 +2972,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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
@@ -2177,8 +2169,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",
|
||||
|
||||
Reference in New Issue
Block a user