Merge "Remove freeze(), unfreeze() and setFreezeTint()." (abae83d1) · Commits · e / os / android_frameworks_base

core/java/android/view/Surface.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -217,9 +217,6 @@ public class Surface implements Parcelable {
		/** Hide the surface. Equivalent to calling hide(). @hide */
		public static final int SURFACE_HIDDEN = 0x01;

		/** Freeze the surface. Equivalent to calling freeze(). @hide */
		public static final int SURFACE_FROZEN = 0x02;

		/** Enable dithering when compositing this surface @hide */
		public static final int SURFACE_DITHER = 0x04;

		@@ -487,12 +484,6 @@ public class Surface implements Parcelable {
		/** @hide */
		public native void setMatrix(float dsdx, float dtdx, float dsdy, float dtdy);
		/** @hide */
		public native void freeze();
		/** @hide */
		public native void unfreeze();
		/** @hide */
		public native void setFreezeTint(int tint);
		/** @hide */
		public native void setFlags(int flags, int mask);
		/** @hide */
		public native void setWindowCrop(Rect crop);

core/jni/android_view_Surface.cpp

+0 −37

Original line number	Diff line number	Diff line
		@@ -637,28 +637,6 @@ static void Surface_show(
		}
		}

		static void Surface_freeze(
		JNIEnv* env, jobject clazz)
		{
		const sp<SurfaceControl>& surface(getSurfaceControl(env, clazz));
		if (surface == 0) return;
		status_t err = surface->freeze();
		if (err<0 && err!=NO_INIT) {
		doThrowIAE(env);
		}
		}

		static void Surface_unfreeze(
		JNIEnv* env, jobject clazz)
		{
		const sp<SurfaceControl>& surface(getSurfaceControl(env, clazz));
		if (surface == 0) return;
		status_t err = surface->unfreeze();
		if (err<0 && err!=NO_INIT) {
		doThrowIAE(env);
		}
		}

		static void Surface_setFlags(
		JNIEnv* env, jobject clazz, jint flags, jint mask)
		{
		@@ -717,18 +695,6 @@ static void Surface_setMatrix(
		}
		}

		static void Surface_setFreezeTint(
		JNIEnv* env, jobject clazz,
		jint tint)
		{
		const sp<SurfaceControl>& surface(getSurfaceControl(env, clazz));
		if (surface == 0) return;
		status_t err = surface->setFreezeTint(tint);
		if (err<0 && err!=NO_INIT) {
		doThrowIAE(env);
		}
		}

		static void Surface_setWindowCrop(JNIEnv* env, jobject thiz, jobject crop)
		{
		const sp<SurfaceControl>& surface(getSurfaceControl(env, thiz));
		@@ -881,13 +847,10 @@ static JNINativeMethod gSurfaceMethods[] = {
		{"setSize", "(II)V",(void*)Surface_setSize },
		{"hide", "()V", (void*)Surface_hide },
		{"show", "()V", (void*)Surface_show },
		{"freeze", "()V", (void*)Surface_freeze },
		{"unfreeze", "()V", (void*)Surface_unfreeze },
		{"setFlags", "(II)V",(void*)Surface_setFlags },
		{"setTransparentRegionHint","(Landroid/graphics/Region;)V", (void*)Surface_setTransparentRegion },
		{"setAlpha", "(F)V", (void*)Surface_setAlpha },
		{"setMatrix", "(FFFF)V", (void*)Surface_setMatrix },
		{"setFreezeTint", "(I)V", (void*)Surface_setFreezeTint },
		{"readFromParcel", "(Landroid/os/Parcel;)V", (void*)Surface_readFromParcel },
		{"writeToParcel", "(Landroid/os/Parcel;I)V", (void*)Surface_writeToParcel },
		{"isConsumerRunningBehind", "()Z", (void*)Surface_isConsumerRunningBehind },