auto import from //depot/cupcake/@136620 (b22d55b9) · Commits · e / os / android_frameworks_base

api/current.xml

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -11316,6 +11316,17 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="VideoView_error_text_invalid_progressive_playback"
			type="int"
			transient="false"
			volatile="false"
			value="17039381"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="VideoView_error_text_unknown"		<field name="VideoView_error_text_unknown"
	type="int"		type="int"
	transient="false"		transient="false"

core/jni/android_util_FileObserver.cpp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -84,6 +84,10 @@ static void android_os_fileobserver_observe(JNIEnv* env, jobject object, jint fd
	}		}

	env->CallVoidMethod(object, method_onEvent, event->wd, event->mask, path);		env->CallVoidMethod(object, method_onEvent, event->wd, event->mask, path);
			if (path != NULL)
			{
			env->DeleteLocalRef(path);
			}

	event_size = sizeof(*event) + event->len;		event_size = sizeof(*event) + event->len;
	num_bytes -= event_size;		num_bytes -= event_size;

core/res/res/values/public.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1068,6 +1068,7 @@
	<public type="style" name="ButtonBar" id="0x01030058" />		<public type="style" name="ButtonBar" id="0x01030058" />

	<public type="string" name="dialog_alert_title" id="0x01040014" />		<public type="string" name="dialog_alert_title" id="0x01040014" />
			<public type="string" name="VideoView_error_text_invalid_progressive_playback" id="0x01040015" />

	<public type="drawable" name="emo_im_angel" id="0x010800a4" />		<public type="drawable" name="emo_im_angel" id="0x010800a4" />
	<public type="drawable" name="emo_im_cool" id="0x010800a5" />		<public type="drawable" name="emo_im_cool" id="0x010800a5" />

core/res/res/values/strings.xml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1471,6 +1471,8 @@

	<!-- Title for error alert when a video cannot be played. it can be used by any app. -->		<!-- Title for error alert when a video cannot be played. it can be used by any app. -->
	<string name="VideoView_error_title">Cannot play video</string>		<string name="VideoView_error_title">Cannot play video</string>
			<!-- Text for error alert when a video container is not valid for progressive download/playback. -->
			<string name="VideoView_error_text_invalid_progressive_playback">Sorry, this video is not valid for streaming to this device.</string>
	<!-- Text for error alert when a video cannot be played. it can be used by any app. -->		<!-- Text for error alert when a video cannot be played. it can be used by any app. -->
	<string name="VideoView_error_text_unknown">Sorry, this video cannot be played.</string>		<string name="VideoView_error_text_unknown">Sorry, this video cannot be played.</string>
	<!-- Button to close error alert when a video cannot be played -->		<!-- Button to close error alert when a video cannot be played -->

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaMetadataRetrieverTest.java

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,8 @@ import android.graphics.Bitmap;
	import java.io.FileOutputStream;		import java.io.FileOutputStream;
	import android.test.AndroidTestCase;		import android.test.AndroidTestCase;
	import com.android.mediaframeworktest.MediaNames;		import com.android.mediaframeworktest.MediaNames;
	import android.test.suitebuilder.annotation.*;		import android.test.suitebuilder.annotation.LargeTest;
			import android.test.suitebuilder.annotation.Suppress;

	/**		/**
	* WARNING:		* WARNING:
	@@ -34,7 +35,7 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase {
	private static final String TAG = "MediaMetadataRetrieverTest";		private static final String TAG = "MediaMetadataRetrieverTest";

	// Test album art extraction.		// Test album art extraction.
	@MediumTest		@LargeTest
	public static void testAlbumArt() throws Exception {		public static void testAlbumArt() throws Exception {
	Log.v(TAG, "testAlbumArt starts.");		Log.v(TAG, "testAlbumArt starts.");
	MediaMetadataRetriever retriever = new MediaMetadataRetriever();		MediaMetadataRetriever retriever = new MediaMetadataRetriever();
	@@ -108,7 +109,7 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase {

	// If the specified call order and valid media file is used, no exception		// If the specified call order and valid media file is used, no exception
	// should be thrown.		// should be thrown.
	@MediumTest		@LargeTest
	public static void testBasicNormalMethodCallSequence() throws Exception {		public static void testBasicNormalMethodCallSequence() throws Exception {
	MediaMetadataRetriever retriever = new MediaMetadataRetriever();		MediaMetadataRetriever retriever = new MediaMetadataRetriever();
	retriever.setMode(MediaMetadataRetriever.MODE_GET_METADATA_ONLY);		retriever.setMode(MediaMetadataRetriever.MODE_GET_METADATA_ONLY);
	@@ -135,7 +136,7 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase {

	// If setDataSource() has not been called, both captureFrame() and extractMetadata() must		// If setDataSource() has not been called, both captureFrame() and extractMetadata() must
	// return null.		// return null.
	@MediumTest		@LargeTest
	public static void testBasicAbnormalMethodCallSequence() {		public static void testBasicAbnormalMethodCallSequence() {
	MediaMetadataRetriever retriever = new MediaMetadataRetriever();		MediaMetadataRetriever retriever = new MediaMetadataRetriever();
	retriever.setMode(MediaMetadataRetriever.MODE_GET_METADATA_ONLY);		retriever.setMode(MediaMetadataRetriever.MODE_GET_METADATA_ONLY);
	@@ -144,7 +145,7 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase {
	}		}

	// Test setDataSource()		// Test setDataSource()
	@MediumTest		@LargeTest
	public static void testSetDataSource() {		public static void testSetDataSource() {
	MediaMetadataRetriever retriever = new MediaMetadataRetriever();		MediaMetadataRetriever retriever = new MediaMetadataRetriever();
	retriever.setMode(MediaMetadataRetriever.MODE_GET_METADATA_ONLY);		retriever.setMode(MediaMetadataRetriever.MODE_GET_METADATA_ONLY);
	@@ -189,7 +190,7 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase {
	// Due to the lack of permission to access hardware decoder, any calls		// Due to the lack of permission to access hardware decoder, any calls
	// attempting to capture a frame will fail. These are commented out for now		// attempting to capture a frame will fail. These are commented out for now
	// until we find a solution to this access permission problem.		// until we find a solution to this access permission problem.
	@MediumTest		@LargeTest
	public static void testIntendedUsage() {		public static void testIntendedUsage() {
	// By default, capture frame and retrieve metadata		// By default, capture frame and retrieve metadata
	MediaMetadataRetriever retriever = new MediaMetadataRetriever();		MediaMetadataRetriever retriever = new MediaMetadataRetriever();