Merge "fix AudioTrack testPlaybackHeadPositionAfterStop()" into jb-dev
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index e5af74a..589f155 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -48,12 +48,12 @@
$(cts_external_packages)
# Temporarily blacklisted packages
-# CtsAccessibilityServiceTestCases \
# CtsWebkitSecurityTestCases \
# Test packages that require an associated test package XML.
cts_test_packages := \
CtsAccelerationTestCases \
+ CtsAccessibilityServiceTestCases \
CtsAccountManagerTestCases \
CtsAccessibilityTestCases \
CtsAdminTestCases \
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/MediaFrameworkTest.java b/tests/tests/mediastress/src/android/mediastress/cts/MediaFrameworkTest.java
index 867da46..8d1e998 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/MediaFrameworkTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/MediaFrameworkTest.java
@@ -61,17 +61,20 @@
//Acquire the full wake lock to keep the device up
PowerManager pm = (PowerManager) this.getSystemService(Context.POWER_SERVICE);
mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK, "MediaFrameworkTest");
+ mWakeLock.setReferenceCounted(false);
}
@Override
protected void onResume() {
+ Log.v(TAG, "onResume, acquire wakelock");
super.onResume();
mWakeLock.acquire();
}
public void onPause(Bundle icicle) {
- super.onStop();
+ Log.v(TAG, "onPause, release wakelock");
mWakeLock.release();
+ super.onPause();
}
public void surfaceDestroyed(SurfaceHolder holder) {