Merge "DO NOT MERGE Bump CTS version for L, to avoid confusion with earlier versions" into lmp-dev
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 3347ba4..2760851 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -141,8 +141,10 @@
<uses-feature android:name="android.hardware.camera" />
</feature-group>
+ <!-- maxRecents=1 keeps the recents list from filling memory with thumbnails -->
<application android:label="Android TestCase"
android:icon="@drawable/size_48x48"
+ android:maxRecents="1"
android:multiArch="true"
android:name="android.app.cts.MockApplication"
android:supportsRtl="true">
diff --git a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTestActivity.java b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTestActivity.java
index 4d9b97d..42a4375 100644
--- a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTestActivity.java
+++ b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTestActivity.java
@@ -25,6 +25,7 @@
super.onCreate(savedInstanceState);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
- | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+ | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+ | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
}
}
diff --git a/tests/tests/media/src/android/media/cts/AudioTrackTest.java b/tests/tests/media/src/android/media/cts/AudioTrackTest.java
index ea1ac37..5eaf725 100644
--- a/tests/tests/media/src/android/media/cts/AudioTrackTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioTrackTest.java
@@ -1216,11 +1216,12 @@
AudioTrack.ERROR_BAD_VALUE);
}
- // Test case 2: getMinBufferSize() return ERROR_BAD_VALUE if SR > 48000
+ // Test case 2: getMinBufferSize() return ERROR_BAD_VALUE if sample rate too high
public void testGetMinBufferSizeTooHighSR() throws Exception {
// constant for test
final String TEST_NAME = "testGetMinBufferSizeTooHighSR";
- final int TEST_SR = 48001;
+ // FIXME need an API to retrieve AudioTrack.SAMPLE_RATE_HZ_MAX
+ final int TEST_SR = 96001;
final int TEST_CONF = AudioFormat.CHANNEL_CONFIGURATION_MONO;
final int TEST_FORMAT = AudioFormat.ENCODING_PCM_8BIT;
diff --git a/tests/tests/print/src/android/print/cts/PrintDocumentActivity.java b/tests/tests/print/src/android/print/cts/PrintDocumentActivity.java
index 6a191a6..41e7a57 100644
--- a/tests/tests/print/src/android/print/cts/PrintDocumentActivity.java
+++ b/tests/tests/print/src/android/print/cts/PrintDocumentActivity.java
@@ -18,11 +18,16 @@
import android.app.Activity;
import android.os.Bundle;
+import android.view.WindowManager;
public class PrintDocumentActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+ | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+ | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
}
}