Merge branch 'master' into froyo-release (216aec8e) · Commits · e / os / android_frameworks_native-old

awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java

+16 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package org.apache.harmony.awt.gl.font;

		import com.android.internal.awt.AndroidGraphics2D;

awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java

+17 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package org.apache.harmony.awt.gl.image;

		// A simple PNG decoder source code in Java.

common/java/com/android/common/speech/Recognition.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ public class Recognition {
		public static final int HINT_CONTEXT_UNKNOWN = 0;
		public static final int HINT_CONTEXT_VOICE_SEARCH_HELP = 1;
		public static final int HINT_CONTEXT_CAR_HOME = 2;
		public static final int HINT_CONTEXT_LAUNCHER = 3;

		private Recognition() { } // don't instantiate
		}

include/surfaceflinger/Surface.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -210,9 +210,16 @@ private:

		status_t dequeueBuffer(sp<GraphicBuffer>* buffer);

		void dispatch_setUsage(va_list args);
		int dispatch_connect(va_list args);
		int dispatch_disconnect(va_list args);

		void setUsage(uint32_t reqUsage);
		int connect(int api);
		int disconnect(int api);

		uint32_t getUsage() const;
		int getConnectedApi() const;

		// constants
		sp<SurfaceComposerClient> mClient;
		@@ -227,6 +234,7 @@ private:
		// protected by mSurfaceLock
		Rect mSwapRectangle;
		uint32_t mUsage;
		int mConnected;

		// protected by mSurfaceLock. These are also used from lock/unlock
		// but in that case, they must be called form the same thread.

include/ui/egl/android_natives.h

+37 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,14 @@ enum {

		/* valid operations for the (perform)() hook /
		enum {
		NATIVE_WINDOW_SET_USAGE = 0
		NATIVE_WINDOW_SET_USAGE = 0,
		NATIVE_WINDOW_CONNECT = 1,
		NATIVE_WINDOW_DISCONNECT = 2
		};

		/* parameter for NATIVE_WINDOW_[DIS]CONNECT */
		enum {
		NATIVE_WINDOW_API_EGL = 1
		};

		typedef struct android_native_window_t
		@@ -157,8 +164,13 @@ typedef struct android_native_window_t
		* This hook should not be called directly, instead use the helper functions
		* defined below.
		*
		* (*perform)() returns -ENOENT if the 'what' parameter is not supported
		* by the surface's implementation.
		*
		* The valid operations are:
		* NATIVE_WINDOW_SET_USAGE
		* NATIVE_WINDOW_CONNECT
		* NATIVE_WINDOW_DISCONNECT
		*
		*/

		@@ -185,6 +197,30 @@ static inline int native_window_set_usage(
		return window->perform(window, NATIVE_WINDOW_SET_USAGE, usage);
		}

		/*
		* native_window_connect(..., NATIVE_WINDOW_API_EGL) must be called
		* by EGL when the window is made current.
		* Returns -EINVAL if for some reason the window cannot be connected, which
		* can happen if it's connected to some other API.
		*/
		static inline int native_window_connect(
		android_native_window_t* window, int api)
		{
		return window->perform(window, NATIVE_WINDOW_CONNECT, api);
		}

		/*
		* native_window_disconnect(..., NATIVE_WINDOW_API_EGL) must be called
		* by EGL when the window is made not current.
		* An error is returned if for instance the window wasn't connected in the
		* first place.
		*/
		static inline int native_window_disconnect(
		android_native_window_t* window, int api)
		{
		return window->perform(window, NATIVE_WINDOW_DISCONNECT, api);
		}


		// ---------------------------------------------------------------------------