merge in ics-mr1-release history after reset to ics-mr1
diff --git a/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java b/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java
index 5e10b38..d7732a9 100644
--- a/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java
+++ b/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java
@@ -219,8 +219,11 @@
addLayout(R.string.togglebutton_checked, "toggle_button_checked",
R.layout.togglebutton_checked, null, NO_TIMEOUT_MS);
- addLayout(R.string.zoomcontrols, "zoomcontrols",
- R.layout.zoomcontrols, null, NO_TIMEOUT_MS);
+
+ // TODO: Zoom control hasn't been styled for Holo so don't test them.
+
+// addLayout(R.string.zoomcontrols, "zoomcontrols",
+// R.layout.zoomcontrols, null, NO_TIMEOUT_MS);
// Dialogs
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
index 9947592..ff43e27 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
@@ -27,6 +27,7 @@
import android.os.PowerManager;
import java.io.File;
+import java.util.concurrent.CountDownLatch;
/**
* Tests for the MediaPlayer API and local video/audio playback.
@@ -36,6 +37,7 @@
* Attribution 3.0 License at http://creativecommons.org/licenses/by/3.0/us/.
*/
public class MediaPlayerTest extends MediaPlayerTestBase {
+
public void testPlayNullSource() throws Exception {
try {
mMediaPlayer.setDataSource((String) null);
@@ -109,9 +111,18 @@
* from the time setDisplay() was called
*/
public void testVideoSurfaceResetting() throws Exception {
- final int tolerance = 150;
+ final int tolerance = 66 * 3 / 2; /* Test video is 15fps... 66 ms per frame */
final int seekPos = 1500;
+ final CountDownLatch seekDone = new CountDownLatch(1);
+
+ mMediaPlayer.setOnSeekCompleteListener(new MediaPlayer.OnSeekCompleteListener() {
+ @Override
+ public void onSeekComplete(MediaPlayer mp) {
+ seekDone.countDown();
+ }
+ });
+
playVideoTest(R.raw.testvideo, 352, 288);
mMediaPlayer.start();
@@ -121,19 +132,20 @@
mMediaPlayer.setDisplay(getActivity().getSurfaceHolder2());
int posAfter = mMediaPlayer.getCurrentPosition();
- assertEquals(posAfter, posBefore);
+ assertEquals(posAfter, posBefore, tolerance);
assertTrue(mMediaPlayer.isPlaying());
Thread.sleep(SLEEP_TIME);
mMediaPlayer.seekTo(seekPos);
+ seekDone.await();
Thread.sleep(SLEEP_TIME / 2);
posBefore = mMediaPlayer.getCurrentPosition();
mMediaPlayer.setDisplay(null);
posAfter = mMediaPlayer.getCurrentPosition();
- assertEquals(posAfter, posBefore);
+ assertEquals(posAfter, posBefore, tolerance);
assertEquals(seekPos + SLEEP_TIME / 2, posBefore, tolerance);
assertTrue(mMediaPlayer.isPlaying());
@@ -143,7 +155,7 @@
mMediaPlayer.setDisplay(getActivity().generateSurfaceHolder());
posAfter = mMediaPlayer.getCurrentPosition();
- assertEquals(posAfter, posBefore);
+ assertEquals(posAfter, posBefore, tolerance);
assertTrue(mMediaPlayer.isPlaying());
Thread.sleep(SLEEP_TIME);
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/MediaRecorderStressTest.java b/tests/tests/mediastress/src/android/mediastress/cts/MediaRecorderStressTest.java
index 1615159..fd4e3b3 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/MediaRecorderStressTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/MediaRecorderStressTest.java
@@ -285,6 +285,7 @@
mRecorder.prepare();
Log.v(TAG, "before release");
Thread.sleep(WAIT_TIME_CAMERA_TEST);
+ mRecorder.reset();
mRecorder.release();
Log.v(TAG, "release video recorder");
output.write(", " + i);
diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index add88a9..294288f 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -194,15 +194,18 @@
"/data/app-private",
"/data/backup",
"/data/battd",
+ "/data/bootlogo",
"/data/btips",
"/data/btips/TI",
"/data/btips/TI/opp",
"/data/calibration",
+ "/data/clp",
"/data/dalvik-cache",
"/data/data/.drm",
"/data/data/.drm/.wmdrm",
"/data/data/cw",
"/data/data/com.android.htcprofile",
+ "/data/data/com.android.providers.drm/rights",
"/data/data/com.htc.android.qxdm2sd",
"/data/data/com.htc.android.qxdm2sd/bin",
"/data/data/com.htc.android.qxdm2sd/data",
@@ -215,7 +218,9 @@
"/data/data/com.htc.loggers/htclog",
"/data/data/com.htc.loggers/tmp",
"/data/data/com.htc.loggers/htcghost",
- "/data/data/com.android.providers.drm/rights",
+ "/data/data/com.lge.ers/android",
+ "/data/data/com.lge.ers/arm9",
+ "/data/data/com.lge.ers/kernel",
"/data/data/recovery",
"/data/dontpanic",
"/data/drm",
@@ -223,6 +228,7 @@
"/data/dump",
"/data/fota",
"/data/emt",
+ "/data/gpscfg",
"/data/hwvefs",
"/data/htcfs",
"/data/local",
@@ -242,6 +248,7 @@
"/data/misc/wifi",
"/data/misc/wifi/sockets",
"/data/misc/wpa_supplicant",
+ "/data/nvcam",
"/data/panicreports",
"/data/property",
"/data/radio",
@@ -262,6 +269,7 @@
"/data/wifi",
"/data/wiper",
"/data/wpstiles",
+ "/data/xt9",
"/dbdata/databases",
"/efs/.android",
"/mnt_ext",
@@ -269,7 +277,12 @@
"/mnt_ext/badablk3",
"/mnt_ext/cache",
"/mnt_ext/data",
+ "/system/etc/dhcpcd/dhcpcd-run-hooks",
"/system/etc/security/drm",
+ "/synthesis/hades",
+ "/synthesis/chimaira",
+ "/synthesis/shdisp",
+ "/synthesis/hdmi",
"/tmp"
)
);