Merge branch 'gingerbread' into gingerbread-release (fa39f3fb) · Commits · e / os / android_frameworks_base

Android.mk

+27 −0

Original line number	Diff line number	Diff line
		@@ -471,6 +471,33 @@ $(full_target): $(framework_built)
		$(INTERNAL_PLATFORM_API_FILE): $(full_target)
		$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE))

		# ==== check javadoc comments but don't generate docs ========
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
		LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)
		LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
		LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
		LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)
		LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
		LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)

		LOCAL_MODULE := doc-comment-check

		LOCAL_DROIDDOC_OPTIONS:=\
		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
		-parsecomments

		LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
		LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk

		include $(BUILD_DROIDDOC)

		# $(gen), i.e. framework.aidl, is also needed while building against the current stub.
		$(full_target): $(framework_built) $(gen)

		droidcore: doc-comment-check-docs

		# ==== static html in the sdk ==================================
		include $(CLEAR_VARS)

api/current.xml

+16 −16

Original line number	Diff line number	Diff line
		@@ -97628,7 +97628,7 @@
		type="android.net.SSLCertificateSocketFactory"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="handshakeTimeoutMillis" type="int">
		@@ -99728,7 +99728,7 @@
		type="android.net.http.SslCertificate"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="issuedTo" type="java.lang.String">
		@@ -99795,7 +99795,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		@@ -99817,7 +99817,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		@@ -173174,7 +173174,7 @@
		abstract="false"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		<constructor name="EventLogTags"
		@@ -203508,7 +203508,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		@@ -204054,7 +204054,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="flag" type="boolean">
		@@ -206179,7 +206179,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="view" type="android.webkit.WebView">
		@@ -214712,7 +214712,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		@@ -405008,7 +405008,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="protected"
		>
		<parameter name="pattern" type="java.lang.String">
		@@ -412389,7 +412389,7 @@
		abstract="true"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="getLength"
		@@ -412878,7 +412878,7 @@
		abstract="true"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="characters"
		@@ -413093,7 +413093,7 @@
		abstract="false"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		<implements name="org.xml.sax.DTDHandler">
		@@ -413560,7 +413560,7 @@
		abstract="true"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="parse"
		@@ -414992,7 +414992,7 @@
		abstract="false"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		<implements name="org.xml.sax.AttributeList">
		@@ -416481,7 +416481,7 @@
		abstract="false"
		static="false"
		final="false"
		deprecated="deprecated"
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="makeParser"

cmds/stagefright/record.cpp

+19 −1

Original line number	Diff line number	Diff line
		@@ -32,9 +32,15 @@

		using namespace android;

		static const int32_t kFramerate = 24; // fps
		static const int32_t kIFramesIntervalSec = 1;
		static const int32_t kVideoBitRate = 512 * 1024;
		static const int32_t kAudioBitRate = 12200;
		static const int32_t kColorFormat = OMX_COLOR_FormatYUV420SemiPlanar;
		static const int64_t kDurationUs = 10000000LL; // 10 seconds

		#if 1
		class DummySource : public MediaSource {
		static const int32_t kFramerate = 24; // fps

		public:
		DummySource(int width, int height)
		@@ -176,6 +182,12 @@ int main(int argc, char **argv) {
		enc_meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_AVC);
		enc_meta->setInt32(kKeyWidth, width);
		enc_meta->setInt32(kKeyHeight, height);
		enc_meta->setInt32(kKeySampleRate, kFramerate);
		enc_meta->setInt32(kKeyBitRate, kVideoBitRate);
		enc_meta->setInt32(kKeyStride, width);
		enc_meta->setInt32(kKeySliceHeight, height);
		enc_meta->setInt32(kKeyIFramesInterval, kIFramesIntervalSec);
		enc_meta->setInt32(kKeyColorFormat, kColorFormat);

		sp<MediaSource> encoder =
		OMXCodec::Create(
		@@ -184,8 +196,10 @@ int main(int argc, char **argv) {
		#if 1
		sp<MPEG4Writer> writer = new MPEG4Writer("/sdcard/output.mp4");
		writer->addSource(encoder);
		writer->setMaxFileDuration(kDurationUs);
		writer->start();
		while (!writer->reachedEOS()) {
		fprintf(stderr, ".");
		usleep(100000);
		}
		writer->stop();
		@@ -194,6 +208,8 @@ int main(int argc, char **argv) {

		MediaBuffer *buffer;
		while (encoder->read(&buffer) == OK) {
		printf(".");
		fflush(stdout);
		int32_t isSync;
		if (!buffer->meta_data()->findInt32(kKeyIsSyncFrame, &isSync)) {
		isSync = false;
		@@ -209,6 +225,7 @@ int main(int argc, char **argv) {
		encoder->stop();
		#endif

		printf("$\n");
		client.disconnect();
		#endif

		@@ -267,6 +284,7 @@ int main(int argc, char **argv) {
		encMeta->setInt32(kKeySampleRate, kSampleRate);
		encMeta->setInt32(kKeyChannelCount, kNumChannels);
		encMeta->setInt32(kKeyMaxInputSize, 8192);
		encMeta->setInt32(kKeyBitRate, kAudioBitRate);

		sp<MediaSource> encoder =
		OMXCodec::Create(client.interface(), encMeta, true, audioSource);

core/jni/android_util_Binder.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -270,6 +270,7 @@ protected:

		IPCThreadState* thread_state = IPCThreadState::self();
		const int strict_policy_before = thread_state->getStrictModePolicy();
		thread_state->setLastTransactionBinderFlags(flags);

		//printf("Transact from %p to Java code sending: ", this);
		//data.print();

include/binder/IPCThreadState.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -44,6 +44,9 @@ public:
		void setStrictModePolicy(int32_t policy);
		int32_t getStrictModePolicy() const;

		void setLastTransactionBinderFlags(int32_t flags);
		int32_t getLastTransactionBinderFlags() const;

		int64_t clearCallingIdentity();
		void restoreCallingIdentity(int64_t token);

		@@ -113,6 +116,7 @@ private:
		pid_t mCallingPid;
		uid_t mCallingUid;
		int32_t mStrictModePolicy;
		int32_t mLastTransactionBinderFlags;
		};

		}; // namespace android