Merge "Cherry-pick: Use getAssetUrl() to access files present in assets folder from master. DO NOT MERGE" into klp-dev
diff --git a/tests/src/android/webkit/cts/WebViewOnUiThread.java b/tests/src/android/webkit/cts/WebViewOnUiThread.java
index 8da830c..7af0043 100644
--- a/tests/src/android/webkit/cts/WebViewOnUiThread.java
+++ b/tests/src/android/webkit/cts/WebViewOnUiThread.java
@@ -27,14 +27,16 @@
import android.test.InstrumentationTestCase;
import android.util.DisplayMetrics;
import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
import android.webkit.DownloadListener;
import android.webkit.ValueCallback;
import android.webkit.WebBackForwardList;
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
-import android.webkit.WebView;
import android.webkit.WebView.HitTestResult;
import android.webkit.WebView.PictureListener;
+import android.webkit.WebView;
import android.webkit.WebViewClient;
import junit.framework.Assert;
@@ -682,6 +684,21 @@
});
}
+ public void setLayoutHeightToMatchParent() {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ ViewParent parent = mWebView.getParent();
+ if (parent instanceof ViewGroup) {
+ ((ViewGroup) parent).getLayoutParams().height =
+ ViewGroup.LayoutParams.MATCH_PARENT;
+ }
+ mWebView.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
+ mWebView.requestLayout();
+ }
+ });
+ }
+
/**
* Helper for running code on the UI thread where an exception is
* a test failure. If this is already the UI thread then it runs
diff --git a/tests/tests/content/src/android/content/cts/ContentProviderTest.java b/tests/tests/content/src/android/content/cts/ContentProviderTest.java
index 2312e53..5ced37c 100644
--- a/tests/tests/content/src/android/content/cts/ContentProviderTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentProviderTest.java
@@ -201,8 +201,8 @@
try {
uri = Uri.parse("content://test");
cp.openFile(uri, "wrong");
- fail("Should throw FileNotFoundException!");
- } catch (FileNotFoundException e) {
+ fail("Should throw IllegalArgumentException for bad mode!");
+ } catch (IllegalArgumentException e) {
}
// delete the temporary file
diff --git a/tests/tests/content/src/android/content/cts/ContentResolverTest.java b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
index 22c2faa..47371cc 100644
--- a/tests/tests/content/src/android/content/cts/ContentResolverTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
@@ -642,8 +642,8 @@
try {
mContentResolver.openFileDescriptor(uri, "d");
- fail("did not throw FileNotFoundException when mode is unknown.");
- } catch (FileNotFoundException e) {
+ fail("did not throw IllegalArgumentException when mode is unknown.");
+ } catch (IllegalArgumentException e) {
//expected.
}
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraCharacteristicsTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraCharacteristicsTest.java
index 2241568..4745100 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraCharacteristicsTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraCharacteristicsTest.java
@@ -26,9 +26,7 @@
import android.content.Context;
import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraDevice;
import android.hardware.camera2.CameraManager;
-import android.os.Handler;
import android.test.AndroidTestCase;
/**
@@ -37,9 +35,6 @@
public class CameraCharacteristicsTest extends AndroidTestCase {
private CameraManager mCameraManager;
- private CameraTestThread mLooperThread;
- private Handler mHandler;
-
@Override
public void setContext(Context context) {
super.setContext(context);
@@ -50,32 +45,18 @@
@Override
protected void setUp() throws Exception {
super.setUp();
-
- mLooperThread = new CameraTestThread();
- mHandler = mLooperThread.start();
}
@Override
protected void tearDown() throws Exception {
- mLooperThread.close();
- mHandler = null;
-
super.tearDown();
}
public void testCameraCharacteristicsAndroidControlAeAvailableAntibandingModes() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.control.aeAvailableAntibandingModes",
props.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_ANTIBANDING_MODES));
@@ -85,16 +66,8 @@
public void testCameraCharacteristicsAndroidControlAeAvailableTargetFpsRanges() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.control.aeAvailableTargetFpsRanges",
props.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES));
@@ -104,16 +77,8 @@
public void testCameraCharacteristicsAndroidControlAeCompensationRange() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.control.aeCompensationRange",
props.get(CameraCharacteristics.CONTROL_AE_COMPENSATION_RANGE));
@@ -123,16 +88,8 @@
public void testCameraCharacteristicsAndroidControlAeCompensationStep() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.control.aeCompensationStep",
props.get(CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP));
@@ -142,16 +99,8 @@
public void testCameraCharacteristicsAndroidControlAfAvailableModes() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.control.afAvailableModes",
props.get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES));
@@ -161,16 +110,8 @@
public void testCameraCharacteristicsAndroidControlAvailableEffects() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.control.availableEffects",
props.get(CameraCharacteristics.CONTROL_AVAILABLE_EFFECTS));
@@ -180,16 +121,8 @@
public void testCameraCharacteristicsAndroidControlAvailableSceneModes() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.control.availableSceneModes",
props.get(CameraCharacteristics.CONTROL_AVAILABLE_SCENE_MODES));
@@ -199,16 +132,8 @@
public void testCameraCharacteristicsAndroidControlAvailableVideoStabilizationModes() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.control.availableVideoStabilizationModes",
props.get(CameraCharacteristics.CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES));
@@ -218,16 +143,8 @@
public void testCameraCharacteristicsAndroidControlAwbAvailableModes() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.control.awbAvailableModes",
props.get(CameraCharacteristics.CONTROL_AWB_AVAILABLE_MODES));
@@ -237,16 +154,8 @@
public void testCameraCharacteristicsAndroidControlMaxRegions() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.control.maxRegions",
props.get(CameraCharacteristics.CONTROL_MAX_REGIONS));
@@ -256,16 +165,8 @@
public void testCameraCharacteristicsAndroidFlashInfoAvailable() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.flash.info.available",
props.get(CameraCharacteristics.FLASH_INFO_AVAILABLE));
@@ -275,16 +176,8 @@
public void testCameraCharacteristicsAndroidJpegAvailableThumbnailSizes() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.jpeg.availableThumbnailSizes",
props.get(CameraCharacteristics.JPEG_AVAILABLE_THUMBNAIL_SIZES));
@@ -294,16 +187,8 @@
public void testCameraCharacteristicsAndroidLensFacing() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.lens.facing",
props.get(CameraCharacteristics.LENS_FACING));
@@ -313,16 +198,8 @@
public void testCameraCharacteristicsAndroidLensInfoAvailableApertures() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.lens.info.availableApertures",
props.get(CameraCharacteristics.LENS_INFO_AVAILABLE_APERTURES));
@@ -332,16 +209,8 @@
public void testCameraCharacteristicsAndroidLensInfoAvailableFilterDensities() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.lens.info.availableFilterDensities",
props.get(CameraCharacteristics.LENS_INFO_AVAILABLE_FILTER_DENSITIES));
@@ -351,16 +220,8 @@
public void testCameraCharacteristicsAndroidLensInfoAvailableFocalLengths() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.lens.info.availableFocalLengths",
props.get(CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS));
@@ -370,16 +231,8 @@
public void testCameraCharacteristicsAndroidLensInfoAvailableOpticalStabilization() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.lens.info.availableOpticalStabilization",
props.get(CameraCharacteristics.LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION));
@@ -389,16 +242,8 @@
public void testCameraCharacteristicsAndroidLensInfoHyperfocalDistance() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.lens.info.hyperfocalDistance",
props.get(CameraCharacteristics.LENS_INFO_HYPERFOCAL_DISTANCE));
@@ -408,16 +253,8 @@
public void testCameraCharacteristicsAndroidLensInfoMinimumFocusDistance() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.lens.info.minimumFocusDistance",
props.get(CameraCharacteristics.LENS_INFO_MINIMUM_FOCUS_DISTANCE));
@@ -427,16 +264,8 @@
public void testCameraCharacteristicsAndroidLensInfoShadingMapSize() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.lens.info.shadingMapSize",
props.get(CameraCharacteristics.LENS_INFO_SHADING_MAP_SIZE));
@@ -446,16 +275,8 @@
public void testCameraCharacteristicsAndroidRequestMaxNumOutputStreams() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.request.maxNumOutputStreams",
props.get(CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_STREAMS));
@@ -465,16 +286,8 @@
public void testCameraCharacteristicsAndroidScalerAvailableFormats() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.scaler.availableFormats",
props.get(CameraCharacteristics.SCALER_AVAILABLE_FORMATS));
@@ -484,16 +297,8 @@
public void testCameraCharacteristicsAndroidScalerAvailableJpegMinDurations() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.scaler.availableJpegMinDurations",
props.get(CameraCharacteristics.SCALER_AVAILABLE_JPEG_MIN_DURATIONS));
@@ -503,16 +308,8 @@
public void testCameraCharacteristicsAndroidScalerAvailableJpegSizes() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.scaler.availableJpegSizes",
props.get(CameraCharacteristics.SCALER_AVAILABLE_JPEG_SIZES));
@@ -522,16 +319,8 @@
public void testCameraCharacteristicsAndroidScalerAvailableMaxDigitalZoom() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.scaler.availableMaxDigitalZoom",
props.get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM));
@@ -541,16 +330,8 @@
public void testCameraCharacteristicsAndroidScalerAvailableProcessedMinDurations() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.scaler.availableProcessedMinDurations",
props.get(CameraCharacteristics.SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS));
@@ -560,16 +341,8 @@
public void testCameraCharacteristicsAndroidScalerAvailableProcessedSizes() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.scaler.availableProcessedSizes",
props.get(CameraCharacteristics.SCALER_AVAILABLE_PROCESSED_SIZES));
@@ -579,16 +352,8 @@
public void testCameraCharacteristicsAndroidSensorBaseGainFactor() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.sensor.baseGainFactor",
props.get(CameraCharacteristics.SENSOR_BASE_GAIN_FACTOR));
@@ -598,16 +363,8 @@
public void testCameraCharacteristicsAndroidSensorMaxAnalogSensitivity() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.sensor.maxAnalogSensitivity",
props.get(CameraCharacteristics.SENSOR_MAX_ANALOG_SENSITIVITY));
@@ -617,16 +374,8 @@
public void testCameraCharacteristicsAndroidSensorOrientation() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.sensor.orientation",
props.get(CameraCharacteristics.SENSOR_ORIENTATION));
@@ -636,16 +385,8 @@
public void testCameraCharacteristicsAndroidSensorInfoActiveArraySize() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.sensor.info.activeArraySize",
props.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE));
@@ -655,16 +396,8 @@
public void testCameraCharacteristicsAndroidSensorInfoSensitivityRange() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.sensor.info.sensitivityRange",
props.get(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE));
@@ -674,16 +407,8 @@
public void testCameraCharacteristicsAndroidSensorInfoExposureTimeRange() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.sensor.info.exposureTimeRange",
props.get(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE));
@@ -693,16 +418,8 @@
public void testCameraCharacteristicsAndroidSensorInfoMaxFrameDuration() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.sensor.info.maxFrameDuration",
props.get(CameraCharacteristics.SENSOR_INFO_MAX_FRAME_DURATION));
@@ -712,16 +429,8 @@
public void testCameraCharacteristicsAndroidSensorInfoPhysicalSize() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.sensor.info.physicalSize",
props.get(CameraCharacteristics.SENSOR_INFO_PHYSICAL_SIZE));
@@ -731,16 +440,8 @@
public void testCameraCharacteristicsAndroidStatisticsInfoAvailableFaceDetectModes() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.statistics.info.availableFaceDetectModes",
props.get(CameraCharacteristics.STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES));
@@ -750,16 +451,8 @@
public void testCameraCharacteristicsAndroidStatisticsInfoMaxFaceCount() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.statistics.info.maxFaceCount",
props.get(CameraCharacteristics.STATISTICS_INFO_MAX_FACE_COUNT));
@@ -769,16 +462,8 @@
public void testCameraCharacteristicsAndroidTonemapMaxCurvePoints() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.tonemap.maxCurvePoints",
props.get(CameraCharacteristics.TONEMAP_MAX_CURVE_POINTS));
@@ -788,16 +473,8 @@
public void testCameraCharacteristicsAndroidInfoSupportedHardwareLevel() throws Exception {
String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
- CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, ids[i], mHandler);
- assertNotNull("Failed to open camera", camera);
- CameraCharacteristics props;
- try {
- props = camera.getProperties();
- }
- finally {
- camera.close();
- }
- assertNotNull(String.format("Can't get camera properties from: ID %s", ids[i]),
+ CameraCharacteristics props = mCameraManager.getCameraCharacteristics(ids[i]);
+ assertNotNull(String.format("Can't get camera characteristics from: ID %s", ids[i]),
props);
assertNotNull("Invalid property: android.info.supportedHardwareLevel",
props.get(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL));
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraTestUtils.java b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraTestUtils.java
index a110ae9..f3a4fa7 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraTestUtils.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraTestUtils.java
@@ -265,11 +265,14 @@
}
}
- public static Size[] getSupportedSizeForFormat(int format, CameraDevice camera)
- throws Exception {
+ public static Size[] getSupportedSizeForFormat(int format, String cameraId,
+ CameraManager cameraManager) throws Exception {
CameraMetadata.Key<Size[]> key = null;
- CameraCharacteristics properties = camera.getProperties();
- assertNotNull("Can't get camera properties!", properties);
+ CameraCharacteristics properties = cameraManager.getCameraCharacteristics(cameraId);
+ assertNotNull("Can't get camera characteristics!", properties);
+ if (VERBOSE) {
+ Log.v(TAG, "get camera characteristics for camera: " + cameraId);
+ }
switch (format) {
case ImageFormat.JPEG:
key = CameraCharacteristics.SCALER_AVAILABLE_JPEG_SIZES;
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java
index 112ca77..1dccb7b 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/ImageReaderTest.java
@@ -129,7 +129,7 @@
}
private void bufferFormatTestByCamera(int format, String cameraId) throws Exception {
- CameraCharacteristics properties = mCamera.getProperties();
+ CameraCharacteristics properties = mCameraManager.getCameraCharacteristics(cameraId);
assertNotNull("Can't get camera properties!", properties);
/**
@@ -150,7 +150,7 @@
Arrays.binarySearch(availableFormats, format) >= 0);
*/
- Size[] availableSizes = getSupportedSizeForFormat(format, mCamera);
+ Size[] availableSizes = getSupportedSizeForFormat(format, mCamera.getId(), mCameraManager);
assertArrayNotEmpty(availableSizes, "availableSizes should not be empty");
// for each resolution, test imageReader:
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacRepeatedPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacRepeatedPlayerTest.java
new file mode 100644
index 0000000..db5d732
--- /dev/null
+++ b/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacRepeatedPlayerTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.mediastress.cts;
+
+import android.media.CamcorderProfile;
+import android.media.MediaRecorder.AudioEncoder;
+import android.media.MediaRecorder.VideoEncoder;
+
+public class H264R1080pAacRepeatedPlayerTest extends MediaPlayerStressTest {
+ private static final String VIDEO_PATH_MIDDLE = "bbb_short/1920x1080/mp4_libx264_libfaac/";
+ private final String[] mMedias = {
+ "bbb_short.ffmpeg.1920x1080.mp4.libx264_10000kbps_30fps.libfaac_stereo_192kbps_48000Hz.mp4",
+ };
+
+ public H264R1080pAacRepeatedPlayerTest() {
+ super(CamcorderProfile.QUALITY_1080P, VideoEncoder.H264, AudioEncoder.AAC);
+ }
+
+ public void testPlay00() throws Exception {
+ doTestVideoPlaybackRepeated(0);
+ }
+
+ @Override
+ protected String getFullVideoClipName(int mediaNumber) {
+ return VIDEO_TOP_DIR + VIDEO_PATH_MIDDLE + mMedias[mediaNumber];
+ }
+}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java b/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
index 3678811..d980e52 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
@@ -40,6 +40,7 @@
protected static final String VIDEO_TOP_DIR = WorkDir.getMediaDirString();
protected static final int REPEAT_NUMBER_FOR_SHORT_CLIPS = 2;
protected static final int REPEAT_NUMBER_FOR_LONG_CLIPS = 1;
+ protected static final int REPEAT_NUMBER_FOR_REPEATED_PLAYBACK = 20;
private static final String TAG = "MediaPlayerStressTest";
// whether a video format is supported or not.
private final boolean mSupported;
@@ -168,4 +169,8 @@
protected void doTestVideoPlaybackLong(int mediaNumber) throws Exception {
doTestVideoPlayback(mediaNumber, REPEAT_NUMBER_FOR_LONG_CLIPS);
}
+
+ protected void doTestVideoPlaybackRepeated(int mediaNumber) throws Exception {
+ doTestVideoPlayback(mediaNumber, REPEAT_NUMBER_FOR_REPEATED_PLAYBACK);
+ }
}
diff --git a/tests/tests/net/jni/NativeDnsJni.c b/tests/tests/net/jni/NativeDnsJni.c
index de9bb67..b975594 100644
--- a/tests/tests/net/jni/NativeDnsJni.c
+++ b/tests/tests/net/jni/NativeDnsJni.c
@@ -20,6 +20,11 @@
#include <stdio.h>
#include <utils/Log.h>
+const char *GoogleDNSIpV4Address="8.8.8.8";
+const char *GoogleDNSIpV4Address2="8.8.4.4";
+const char *GoogleDNSIpV6Address="2001:4860:4860::8888";
+const char *GoogleDNSIpV6Address2="2001:4860:4860::8844";
+
JNIEXPORT jboolean Java_android_net_cts_DnsTest_testNativeDns(JNIEnv* env, jclass class)
{
const char *node = "www.google.com";
@@ -53,8 +58,8 @@
freeaddrinfo(answer);
answer = NULL;
- if (foundv4 != 1 || foundv6 != 1) {
- ALOGD("getaddrinfo(www.google.com) didn't find both v4 and v6");
+ if (foundv4 != 1 && foundv6 != 1) {
+ ALOGD("getaddrinfo(www.google.com) didn't find either v4 or v6 address");
return JNI_FALSE;
}
}
@@ -96,49 +101,50 @@
struct sockaddr_in sa4;
sa4.sin_family = AF_INET;
sa4.sin_port = 0;
- inet_pton(AF_INET, "173.252.110.27", &(sa4.sin_addr));
+ inet_pton(AF_INET, GoogleDNSIpV4Address, &(sa4.sin_addr));
struct sockaddr_in6 sa6;
sa6.sin6_family = AF_INET6;
sa6.sin6_port = 0;
sa6.sin6_flowinfo = 0;
sa6.sin6_scope_id = 0;
- inet_pton(AF_INET6, "2001:4860:4001:802::1008", &(sa6.sin6_addr));
+ inet_pton(AF_INET6, GoogleDNSIpV6Address2, &(sa6.sin6_addr));
char buf[NI_MAXHOST];
int flags = NI_NAMEREQD;
res = getnameinfo((const struct sockaddr*)&sa4, sizeof(sa4), buf, sizeof(buf), NULL, 0, flags);
if (res != 0) {
- ALOGD("getnameinfo(173.252.110.27 (facebook) ) gave error %d (%s)", res, gai_strerror(res));
+ ALOGD("getnameinfo(%s (GoogleDNS) ) gave error %d (%s)", GoogleDNSIpV4Address, res,
+ gai_strerror(res));
return JNI_FALSE;
}
- if (strstr(buf, "facebook.com") == NULL) {
- ALOGD("getnameinfo(173.252.110.27 (facebook) ) didn't return facebook.com: %s", buf);
+ if (strstr(buf, "google.com") == NULL) {
+ ALOGD("getnameinfo(%s (GoogleDNS) ) didn't return google.com: %s",
+ GoogleDNSIpV4Address, buf);
return JNI_FALSE;
}
memset(buf, sizeof(buf), 0);
- res = getnameinfo((const struct sockaddr*)&sa6, sizeof(sa6), buf, sizeof(buf),
- NULL, 0, flags);
+ res = getnameinfo((const struct sockaddr*)&sa6, sizeof(sa6), buf, sizeof(buf), NULL, 0, flags);
if (res != 0) {
- ALOGD("getnameinfo(2a03:2880:2110:df01:face:b00c::8 (facebook) ) gave error %d (%s)",
- res, gai_strerror(res));
+ ALOGD("getnameinfo(%s (GoogleDNS) ) gave error %d (%s)", GoogleDNSIpV6Address2,
+ res, gai_strerror(res));
return JNI_FALSE;
}
- if (strstr(buf, "1e100.net") == NULL) {
- ALOGD("getnameinfo(2a03:2880:2110:df01:face:b00c::8) didn't return facebook.com: %s", buf);
+ if (strstr(buf, "google.com") == NULL) {
+ ALOGD("getnameinfo(%s) didn't return google.com: %s", GoogleDNSIpV6Address2, buf);
return JNI_FALSE;
}
// gethostbyname
- struct hostent *my_hostent = gethostbyname("www.mit.edu");
+ struct hostent *my_hostent = gethostbyname("www.youtube.com");
if (my_hostent == NULL) {
- ALOGD("gethostbyname(www.mit.edu) gave null response");
+ ALOGD("gethostbyname(www.youtube.com) gave null response");
return JNI_FALSE;
}
if ((my_hostent->h_addr_list == NULL) || (*my_hostent->h_addr_list == NULL)) {
- ALOGD("gethostbyname(www.mit.edu) gave 0 addresses");
+ ALOGD("gethostbyname(www.youtube.com) gave 0 addresses");
return JNI_FALSE;
}
{
@@ -146,21 +152,23 @@
while (*current != NULL) {
char buf[256];
inet_ntop(my_hostent->h_addrtype, *current, buf, sizeof(buf));
- ALOGD("gethostbyname(www.mit.edu) gave %s", buf);
+ ALOGD("gethostbyname(www.youtube.com) gave %s", buf);
current++;
}
}
// gethostbyaddr
char addr6[16];
- inet_pton(AF_INET6, "2001:4b10:bbc::2", addr6);
+ inet_pton(AF_INET6, GoogleDNSIpV6Address, addr6);
my_hostent = gethostbyaddr(addr6, sizeof(addr6), AF_INET6);
if (my_hostent == NULL) {
- ALOGD("gethostbyaddr(2001:4b10:bbc::2 (bbc) ) gave null response");
+ ALOGD("gethostbyaddr(%s (GoogleDNS) ) gave null response", GoogleDNSIpV6Address);
return JNI_FALSE;
}
- ALOGD("gethostbyaddr(2001:4b10:bbc::2 (bbc) ) gave %s for name",
- my_hostent->h_name ? my_hostent->h_name : "null");
+
+ ALOGD("gethostbyaddr(%s (GoogleDNS) ) gave %s for name", GoogleDNSIpV6Address,
+ my_hostent->h_name ? my_hostent->h_name : "null");
+
if (my_hostent->h_name == NULL) return JNI_FALSE;
return JNI_TRUE;
}
diff --git a/tests/tests/net/src/android/net/cts/DnsTest.java b/tests/tests/net/src/android/net/cts/DnsTest.java
index cdd95aa..879a962 100644
--- a/tests/tests/net/src/android/net/cts/DnsTest.java
+++ b/tests/tests/net/src/android/net/cts/DnsTest.java
@@ -64,8 +64,13 @@
else if (addr instanceof Inet6Address) foundV6 = true;
if (DBG) Log.e(TAG, "www.google.com gave " + addr.toString());
}
- assertTrue(foundV4);
- assertTrue(foundV6);
+
+ // assertTrue(foundV4);
+ // assertTrue(foundV6);
+
+ // We should have at least one of the addresses to connect!
+ assertTrue(foundV4 || foundV6);
+
try {
addrs = InetAddress.getAllByName("ipv6.google.com");
} catch (UnknownHostException e) {}
@@ -77,8 +82,10 @@
else if (addr instanceof Inet6Address) foundV6 = true;
if (DBG) Log.e(TAG, "ipv6.google.com gave " + addr.toString());
}
+
assertTrue(foundV4 == false);
assertTrue(foundV6 == true);
+
assertTrue(testNativeDns());
}
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index 1646dde..0b8af7a 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -43,6 +43,7 @@
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
+import android.view.ViewGroup;
import android.webkit.ConsoleMessage;
import android.webkit.CookieSyncManager;
import android.webkit.DownloadListener;
@@ -204,14 +205,15 @@
}
public void testZoom() throws Throwable {
+ // Pinch zoom is not supported in wrap_content layouts.
+ mOnUiThread.setLayoutHeightToMatchParent();
+
final ScaleChangedWebViewClient webViewClient = new ScaleChangedWebViewClient();
mOnUiThread.setWebViewClient(webViewClient);
mWebServer = new CtsTestServer(getActivity());
mOnUiThread.loadUrlAndWaitForCompletion(
mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL));
- // Wait for initial scale to be set.
- webViewClient.waitForScaleChanged();
WebSettings settings = mOnUiThread.getSettings();
settings.setSupportZoom(false);
diff --git a/tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java b/tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java
index 80680c0..8c3cc8f 100644
--- a/tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java
+++ b/tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java
@@ -40,7 +40,7 @@
public class CtsUiAutomatorTest extends UiAutomatorTestCase {
private static final String LOG_TAG = CtsUiAutomatorTest.class.getSimpleName();
private static final String[] LIST_SCROLL_TESTS = new String[] {
- "Test 17", "Test 11", "Test 20"
+ "Test 17", "Test 11", "Test 20", "Test 35"
};
private static final String LAUNCH_APP = "am start -a android.intent.action.MAIN"
+ " -n com.android.cts.uiautomator/.MainActivity -W";
diff --git a/tests/uiautomator/test-apps/CtsUiAutomatorApp/src/com/android/cts/uiautomator/TestItems.java b/tests/uiautomator/test-apps/CtsUiAutomatorApp/src/com/android/cts/uiautomator/TestItems.java
index 358516e..db6e693 100644
--- a/tests/uiautomator/test-apps/CtsUiAutomatorApp/src/com/android/cts/uiautomator/TestItems.java
+++ b/tests/uiautomator/test-apps/CtsUiAutomatorApp/src/com/android/cts/uiautomator/TestItems.java
@@ -80,6 +80,16 @@
addTestItem(new TestItem("28", "Test 28", TestGenericDetailFragment.class));
addTestItem(new TestItem("29", "Test 29", TestGenericDetailFragment.class));
addTestItem(new TestItem("30", "Test 30", TestGenericDetailFragment.class));
+ addTestItem(new TestItem("31", "Test 31", TestGenericDetailFragment.class));
+ addTestItem(new TestItem("32", "Test 32", TestGenericDetailFragment.class));
+ addTestItem(new TestItem("33", "Test 33", TestGenericDetailFragment.class));
+ addTestItem(new TestItem("34", "Test 34", TestGenericDetailFragment.class));
+ addTestItem(new TestItem("35", "Test 35", TestGenericDetailFragment.class));
+ addTestItem(new TestItem("36", "Test 36", TestGenericDetailFragment.class));
+ addTestItem(new TestItem("37", "Test 37", TestGenericDetailFragment.class));
+ addTestItem(new TestItem("38", "Test 38", TestGenericDetailFragment.class));
+ addTestItem(new TestItem("39", "Test 39", TestGenericDetailFragment.class));
+ addTestItem(new TestItem("40", "Test 40", TestGenericDetailFragment.class));
}
private static void addTestItem(TestItem item) {
diff --git a/tools/tradefed-host/res/report/cts_result.xsl b/tools/tradefed-host/res/report/cts_result.xsl
index 0c38be1..dfddc09 100644
--- a/tools/tradefed-host/res/report/cts_result.xsl
+++ b/tools/tradefed-host/res/report/cts_result.xsl
@@ -526,7 +526,15 @@
<xsl:value-of select="@result"/>
</div>
</TD>
- <TD class="failuredetails"></TD>
+ <TD class="failuredetails">
+ <div class="details">
+ <ul>
+ <xsl:for-each select="Details/ValueArray/Value">
+ <li><xsl:value-of select="."/></li>
+ </xsl:for-each>
+ </ul>
+ </div>
+ </TD>
</xsl:if>
<xsl:if test="@result='fail'">