Merge change 551 into donut (9e8ca9a1) · Commits · e / os / android_frameworks_base

api/current.xml

+3 −16

Original line number	Diff line number	Diff line
		@@ -58047,7 +58047,7 @@
		type="float"
		transient="false"
		volatile="false"
		value="0.001f"
		value="0.0010f"
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -73275,19 +73275,6 @@
		visibility="public"
		>
		</constructor>
		<method name="_glGetString"
		return="java.lang.String"
		abstract="false"
		native="true"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="name" type="int">
		</parameter>
		</method>
		<method name="glActiveTexture"
		return="void"
		abstract="false"
		@@ -74092,9 +74079,9 @@
		<method name="glGetString"
		return="java.lang.String"
		abstract="false"
		native="false"
		native="true"
		synchronized="false"
		static="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"

+1 −1

Original line number	Diff line number	Diff line
		@@ -3434,7 +3434,7 @@ static JNINativeMethod methods[] = {
		{"glGetError", "()I", (void *) android_glGetError__ },
		{"glGetIntegerv", "(I[II)V", (void *) android_glGetIntegerv__I_3II },
		{"glGetIntegerv", "(ILjava/nio/IntBuffer;)V", (void *) android_glGetIntegerv__ILjava_nio_IntBuffer_2 },
		{"_glGetString", "(I)Ljava/lang/String;", (void *) android_glGetString },
		{"glGetString", "(I)Ljava/lang/String;", (void *) android_glGetString },
		{"glHint", "(II)V", (void *) android_glHint__II },
		{"glLightModelf", "(IF)V", (void *) android_glLightModelf__IF },
		{"glLightModelfv", "(I[FI)V", (void *) android_glLightModelfv__I_3FI },