diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index cc4278bdd2b60..38416eeede32b 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -159,7 +159,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 @@ -1481,16 +1480,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. * diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index 573f378f57b18..50a60a9171858 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -826,13 +826,6 @@ static jint nativeGetActiveConfig(JNIEnv* env, jclass clazz, jobject tokenObj) { return static_cast(SurfaceComposerClient::getActiveConfig(token)); } -static jboolean nativeSetActiveConfig(JNIEnv* env, jclass clazz, jobject tokenObj, jint id) { - sp token(ibinderForJavaObject(env, tokenObj)); - if (token == NULL) return JNI_FALSE; - status_t err = SurfaceComposerClient::setActiveConfig(token, static_cast(id)); - return err == NO_ERROR ? JNI_TRUE : JNI_FALSE; -} - static jintArray nativeGetDisplayColorModes(JNIEnv* env, jclass, jobject tokenObj) { sp token(ibinderForJavaObject(env, tokenObj)); if (token == NULL) return NULL; @@ -1400,8 +1393,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 },