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

Commit b3bb9206 authored by Robert Carr's avatar Robert Carr
Browse files

SurfaceControl: Remove setOverrideScalingMode 

There are no callers.

Bug: 161937501
Test: Existing tests pass
Change-Id: Ib668e9092c60e3b5615cef2369b97ec1e4e6b87b
parent 76758096

core/java/android/view/SurfaceControl.java

+0 −22
Original line number Diff line number Diff line
@@ -187,8 +187,6 @@ public final class SurfaceControl implements Parcelable { 
    private static native void nativeReparent(long transactionObj, long nativeObject,

            long newParentNativeObject);

    private static native void nativeSeverChildren(long transactionObj, long nativeObject);

    private static native void nativeSetOverrideScalingMode(long transactionObj, long nativeObject,

            int scalingMode);



    private static native Display.HdrCapabilities nativeGetHdrCapabilities(IBinder displayToken);
@@ -1518,16 +1516,6 @@ public final class SurfaceControl implements Parcelable { 
        }

    }



    /**

     * @hide

     */

    public void setOverrideScalingMode(int scalingMode) {

        checkNotReleased();

        synchronized(SurfaceControl.class) {

            sGlobalTransaction.setOverrideScalingMode(this, scalingMode);

        }

    }



    /**

     * @hide

     */
@@ -2988,16 +2976,6 @@ public final class SurfaceControl implements Parcelable { 
            return this;

        }



        /**

         * @hide

         */

        public Transaction setOverrideScalingMode(SurfaceControl sc, int overrideScalingMode) {

            checkPreconditions(sc);

            nativeSetOverrideScalingMode(mNativeObject, sc.mNativeObject,

                    overrideScalingMode);

            return this;

        }



        /**

         * Fills the surface with the specified color.

         * @param color A float array with three values to represent r, g, b in range [0..1]. An

core/jni/android_view_SurfaceControl.cpp

+0 −11
Original line number Diff line number Diff line
@@ -1360,15 +1360,6 @@ static void nativeSeverChildren(JNIEnv* env, jclass clazz, jlong transactionObj, 
    transaction->detachChildren(ctrl);

}



static void nativeSetOverrideScalingMode(JNIEnv* env, jclass clazz, jlong transactionObj,

        jlong nativeObject,

        jint scalingMode) {

    auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);



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

    transaction->setOverrideScalingMode(ctrl, scalingMode);

}



static jobject nativeGetHdrCapabilities(JNIEnv* env, jclass clazz, jobject tokenObject) {

    sp<IBinder> token(ibinderForJavaObject(env, tokenObject));

    if (token == NULL) return NULL;
@@ -1694,8 +1685,6 @@ static const JNINativeMethod sSurfaceControlMethods[] = { 
            (void*)nativeReparent },

    {"nativeSeverChildren", "(JJ)V",

            (void*)nativeSeverChildren } ,

    {"nativeSetOverrideScalingMode", "(JJI)V",

            (void*)nativeSetOverrideScalingMode },

    {"nativeCaptureDisplay",

            "(Landroid/view/SurfaceControl$DisplayCaptureArgs;Landroid/view/SurfaceControl$ScreenCaptureListener;)I",

            (void*)nativeCaptureDisplay },

services/tests/wmtests/src/com/android/server/wm/StubTransaction.java

+0 −6
Original line number Diff line number Diff line
@@ -162,12 +162,6 @@ public class StubTransaction extends SurfaceControl.Transaction { 
        return this;

    }



    @Override

    public SurfaceControl.Transaction setOverrideScalingMode(SurfaceControl sc,

            int overrideScalingMode) {

        return this;

    }



    @Override

    public SurfaceControl.Transaction setColor(SurfaceControl sc, float[] color) {

        return this;