Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

auto import from //depot/cupcake/@136620

Browse Source
This commit is contained in:
The Android Open Source Project
2009-03-05 15:45:10 -08:00
parent 4df2423a94
commit b22d55b9f8
13 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/current.xml
View File

@@ -11316,6 +11316,17 @@
visibility="public"
>
</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"
type="int"
transient="false"

4
core/jni/android_util_FileObserver.cpp
View File

@@ -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);
if (path != NULL)
{
env->DeleteLocalRef(path);
}
event_size = sizeof(*event) + event->len;
num_bytes -= event_size;

1
core/res/res/values/public.xml
View File

@@ -1068,6 +1068,7 @@
<public type="style" name="ButtonBar" id="0x01030058" />
<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_cool" id="0x010800a5" />

2
core/res/res/values/strings.xml
View File

@@ -1471,6 +1471,8 @@
<!-- 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>
<!-- 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. -->
<string name="VideoView_error_text_unknown">Sorry, this video cannot be played.</string>
<!-- Button to close error alert when a video cannot be played -->

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

@@ -22,7 +22,8 @@ import android.graphics.Bitmap;
import java.io.FileOutputStream;
import android.test.AndroidTestCase;
import com.android.mediaframeworktest.MediaNames;
import android.test.suitebuilder.annotation.*;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.Suppress;
/**
* WARNING:
@@ -34,7 +35,7 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase {
private static final String TAG = "MediaMetadataRetrieverTest";
// Test album art extraction.
@MediumTest
@LargeTest
public static void testAlbumArt() throws Exception {
Log.v(TAG, "testAlbumArt starts.");
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
// should be thrown.
@MediumTest
@LargeTest
public static void testBasicNormalMethodCallSequence() throws Exception {
MediaMetadataRetriever retriever = new MediaMetadataRetriever();
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
// return null.
@MediumTest
@LargeTest
public static void testBasicAbnormalMethodCallSequence() {
MediaMetadataRetriever retriever = new MediaMetadataRetriever();
retriever.setMode(MediaMetadataRetriever.MODE_GET_METADATA_ONLY);
@@ -144,7 +145,7 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase {
}
// Test setDataSource()
@MediumTest
@LargeTest
public static void testSetDataSource() {
MediaMetadataRetriever retriever = new MediaMetadataRetriever();
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
// attempting to capture a frame will fail. These are commented out for now
// until we find a solution to this access permission problem.
@MediumTest
@LargeTest
public static void testIntendedUsage() {
// By default, capture frame and retrieve metadata
MediaMetadataRetriever retriever = new MediaMetadataRetriever();

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderPrepareStateUnitTest.java
View File

@@ -18,7 +18,7 @@ package com.android.mediaframeworktest.unit;
import android.media.MediaRecorder;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.Suppress;
import java.io.IOException;
@@ -59,7 +59,7 @@ public class MediaRecorderPrepareStateUnitTest extends AndroidTestCase implement
}
}
@MediumTest
@LargeTest
public void testPrepare() {
mTestTemplate.runTestOnMethod(this);
}

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderResetStateUnitTest.java
View File

@@ -18,7 +18,7 @@ package com.android.mediaframeworktest.unit;
import android.media.MediaRecorder;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.Suppress;
/**
@@ -54,7 +54,7 @@ public class MediaRecorderResetStateUnitTest extends AndroidTestCase implements
recorder.reset();
}
@MediumTest
@LargeTest
public void testReset() {
mTestTemplate.runTestOnMethod(this);
}

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioEncoderStateUnitTest.java
View File

@@ -18,7 +18,7 @@ package com.android.mediaframeworktest.unit;
import android.media.MediaRecorder;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.Suppress;
/**
@@ -54,7 +54,7 @@ public class MediaRecorderSetAudioEncoderStateUnitTest extends AndroidTestCase i
recorder.setAudioEncoder(MediaRecorderStateUnitTestTemplate.AUDIO_ENCODER);
}
@MediumTest
@LargeTest
public void testSetAudioEncoder() {
mTestTemplate.runTestOnMethod(this);
}

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetAudioSourceStateUnitTest.java
View File

@@ -18,7 +18,7 @@ package com.android.mediaframeworktest.unit;
import android.media.MediaRecorder;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.Suppress;
/**
@@ -54,7 +54,7 @@ public class MediaRecorderSetAudioSourceStateUnitTest extends AndroidTestCase im
recorder.setAudioSource(MediaRecorderStateUnitTestTemplate.AUDIO_SOURCE);
}
@MediumTest
@LargeTest
public void testSetAudioSource() {
mTestTemplate.runTestOnMethod(this);
}

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFileStateUnitTest.java
View File

@@ -18,7 +18,7 @@ package com.android.mediaframeworktest.unit;
import android.media.MediaRecorder;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.Suppress;
/**
@@ -51,7 +51,7 @@ public class MediaRecorderSetOutputFileStateUnitTest extends AndroidTestCase imp
recorder.setOutputFile(MediaRecorderStateUnitTestTemplate.RECORD_OUTPUT_PATH);
}
@MediumTest
@LargeTest
public void testSetOutputFile() {
mTestTemplate.runTestOnMethod(this);
}

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderSetOutputFormatStateUnitTest.java
View File

@@ -18,7 +18,7 @@ package com.android.mediaframeworktest.unit;
import android.media.MediaRecorder;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.Suppress;
/**
@@ -54,7 +54,7 @@ public class MediaRecorderSetOutputFormatStateUnitTest extends AndroidTestCase i
recorder.setOutputFormat(MediaRecorderStateUnitTestTemplate.OUTPUT_FORMAT);
}
@MediumTest
@LargeTest
public void testSetOutputFormat() {
mTestTemplate.runTestOnMethod(this);
}

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStartStateUnitTest.java
View File

@@ -18,7 +18,7 @@ package com.android.mediaframeworktest.unit;
import android.media.MediaRecorder;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.Suppress;
/**
@@ -54,7 +54,7 @@ public class MediaRecorderStartStateUnitTest extends AndroidTestCase implements
recorder.start();
}
@MediumTest
@LargeTest
public void testStart() {
mTestTemplate.runTestOnMethod(this);
}

4
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaRecorderStopStateUnitTest.java
View File

@@ -18,7 +18,7 @@ package com.android.mediaframeworktest.unit;
import android.media.MediaRecorder;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.Suppress;
/**
@@ -54,7 +54,7 @@ public class MediaRecorderStopStateUnitTest extends AndroidTestCase implements M
recorder.stop();
}
@MediumTest
@LargeTest
public void testStop() {
mTestTemplate.runTestOnMethod(this);
}