Merge "Make setActiveConfig() private, remove plumbing" (77740176) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceControl.java

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -159,7 +159,6 @@ public final class SurfaceControl implements Parcelable {
	private static native DisplayedContentSample nativeGetDisplayedContentSample(		private static native DisplayedContentSample nativeGetDisplayedContentSample(
	IBinder displayToken, long numFrames, long timestamp);		IBinder displayToken, long numFrames, long timestamp);
	private static native int nativeGetActiveConfig(IBinder displayToken);		private static native int nativeGetActiveConfig(IBinder displayToken);
	private static native boolean nativeSetActiveConfig(IBinder displayToken, int id);
	private static native boolean nativeSetDesiredDisplayConfigSpecs(IBinder displayToken,		private static native boolean nativeSetDesiredDisplayConfigSpecs(IBinder displayToken,
	SurfaceControl.DesiredDisplayConfigSpecs desiredDisplayConfigSpecs);		SurfaceControl.DesiredDisplayConfigSpecs desiredDisplayConfigSpecs);
	private static native SurfaceControl.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.		* Contains information about desired display configuration.
	*		*

core/jni/android_view_SurfaceControl.cpp

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -826,13 +826,6 @@ static jint nativeGetActiveConfig(JNIEnv* env, jclass clazz, jobject tokenObj) {
	return static_cast<jint>(SurfaceComposerClient::getActiveConfig(token));		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) {		static jintArray nativeGetDisplayColorModes(JNIEnv* env, jclass, jobject tokenObj) {
	sp<IBinder> token(ibinderForJavaObject(env, tokenObj));		sp<IBinder> token(ibinderForJavaObject(env, tokenObj));
	if (token == NULL) return NULL;		if (token == NULL) return NULL;
	@@ -1400,8 +1393,6 @@ static const JNINativeMethod sSurfaceControlMethods[] = {
	(void*)nativeGetDisplayConfigs },		(void*)nativeGetDisplayConfigs },
	{"nativeGetActiveConfig", "(Landroid/os/IBinder;)I",		{"nativeGetActiveConfig", "(Landroid/os/IBinder;)I",
	(void*)nativeGetActiveConfig },		(void*)nativeGetActiveConfig },
	{"nativeSetActiveConfig", "(Landroid/os/IBinder;I)Z",
	(void*)nativeSetActiveConfig },
	{"nativeSetDesiredDisplayConfigSpecs",		{"nativeSetDesiredDisplayConfigSpecs",
	"(Landroid/os/IBinder;Landroid/view/SurfaceControl$DesiredDisplayConfigSpecs;)Z",		"(Landroid/os/IBinder;Landroid/view/SurfaceControl$DesiredDisplayConfigSpecs;)Z",
	(void*)nativeSetDesiredDisplayConfigSpecs },		(void*)nativeSetDesiredDisplayConfigSpecs },