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

Commit e8d9d652 authored by Steven Thomas's avatar Steven Thomas
Browse files

Make setActiveConfig() private, remove plumbing 

This is to address leftover code review feedback from ag/9714241. We no
longer use setActiveConfig() except for a call from an internal debug
command, so make it private, and remove the plumbing to support calling
it from other processes.

Bug: 142507213
Test: atest libsurfaceflinger_unittest
Test: atest libgui_test
Test: atest SurfaceFlinger_test
Test: atest sffakehwc_test
Change-Id: I8ae9c2636fc009a7ebeba06a72913a37a6af8ef4
parent a812432d

core/java/android/view/SurfaceControl.java

+0 −11
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ public final class SurfaceControl implements Parcelable { 
    private static native DisplayedContentSample nativeGetDisplayedContentSample(

            IBinder displayToken, long numFrames, long timestamp);

    private static native int nativeGetActiveConfig(IBinder displayToken);

    private static native boolean nativeSetActiveConfig(IBinder displayToken, int id);

    private static native boolean nativeSetDesiredDisplayConfigSpecs(IBinder displayToken,

            SurfaceControl.DesiredDisplayConfigSpecs desiredDisplayConfigSpecs);

    private static native SurfaceControl.DesiredDisplayConfigSpecs
@@ -1473,16 +1472,6 @@ public final class SurfaceControl implements Parcelable { 
    }





    /**

     * @hide

     */

    public static boolean setActiveConfig(IBinder displayToken, int id) {

        if (displayToken == null) {

            throw new IllegalArgumentException("displayToken must not be null");

        }

        return nativeSetActiveConfig(displayToken, id);

    }



    /**

     * Contains information about desired display configuration.

     *

core/jni/android_view_SurfaceControl.cpp

+0 −9
Original line number Diff line number Diff line
@@ -816,13 +816,6 @@ static jint nativeGetActiveConfig(JNIEnv* env, jclass clazz, jobject tokenObj) { 
    return static_cast<jint>(SurfaceComposerClient::getActiveConfig(token));

}



static jboolean nativeSetActiveConfig(JNIEnv* env, jclass clazz, jobject tokenObj, jint id) {

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

    if (token == NULL) return JNI_FALSE;

    status_t err = SurfaceComposerClient::setActiveConfig(token, static_cast<int>(id));

    return err == NO_ERROR ? JNI_TRUE : JNI_FALSE;

}



static jintArray nativeGetDisplayColorModes(JNIEnv* env, jclass, jobject tokenObj) {

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

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

    {"nativeGetActiveConfig", "(Landroid/os/IBinder;)I",

            (void*)nativeGetActiveConfig },

    {"nativeSetActiveConfig", "(Landroid/os/IBinder;I)Z",

            (void*)nativeSetActiveConfig },

    {"nativeSetDesiredDisplayConfigSpecs",

            "(Landroid/os/IBinder;Landroid/view/SurfaceControl$DesiredDisplayConfigSpecs;)Z",

            (void*)nativeSetDesiredDisplayConfigSpecs },