merge in jb-release history after reset to jb-dev
diff --git a/development/ide/eclipse/.classpath b/development/ide/eclipse/.classpath
index 92e13638..2ddb4d8 100644
--- a/development/ide/eclipse/.classpath
+++ b/development/ide/eclipse/.classpath
@@ -22,6 +22,7 @@
<classpathentry kind="src" path="cts/tests/deviceadmin/src"/>
<classpathentry kind="src" path="cts/tests/src"/>
<classpathentry kind="src" path="cts/tests/tests/acceleration/src"/>
+ <classpathentry kind="src" path="cts/tests/tests/accessibility/src"/>
<classpathentry kind="src" path="cts/tests/tests/accessibilityservice/src"/>
<classpathentry kind="src" path="cts/tests/tests/accounts/src"/>
<classpathentry kind="src" path="cts/tests/tests/admin/src"/>
diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index 378b46e..7de787f 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -46,9 +46,12 @@
"libcore.java.net.ConcurrentCloseTest",
"libcore.java.net.SocketTest#testAvailable",
"libcore.java.net.URLConnectionTest",
+ "libcore.java.util.prefs.OldAbstractPreferencesTest#testAddNodeChangeListener",
+ "libcore.java.util.prefs.OldAbstractPreferencesTest#testRemovePreferenceChangeListener",
"libcore.java.util.prefs.OldPreferencesTest#testAddNodeChangeListener",
"libcore.net.http.HttpResponseCacheTest#testClientPrematureDisconnectWithChunkedEncoding",
- "org.apache.harmony.luni.tests.java.net.URLConnectionTest"
+ "org.apache.harmony.luni.tests.java.net.URLConnectionTest",
+ "org.apache.harmony.xnet.provider.jsse.NativeCryptoTest#test_SSL_do_handshake_server_timeout"
]
}
]
diff --git a/tests/tests/accessibility/Android.mk b/tests/tests/accessibility/Android.mk
index b3453e3..ad8f719 100644
--- a/tests/tests/accessibility/Android.mk
+++ b/tests/tests/accessibility/Android.mk
@@ -26,6 +26,8 @@
LOCAL_PACKAGE_NAME := CtsAccessibilityTestCases
+LOCAL_STATIC_JAVA_LIBRARIES := ctsutil
+
# This test runner sets up/cleans up the device before/after running the tests.
LOCAL_CTS_TEST_RUNNER := com.android.cts.tradefed.testtype.AccessibilityTestRunner
diff --git a/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java b/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
index 50740e8..9732117 100644
--- a/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
+++ b/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
@@ -19,6 +19,7 @@
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Service;
import android.content.pm.ServiceInfo;
+import android.cts.util.PollingCheck;
import android.test.AndroidTestCase;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
@@ -60,7 +61,12 @@
}
public void testIsTouchExplorationEnabled() throws Exception {
- assertTrue(mAccessibilityManager.isTouchExplorationEnabled());
+ new PollingCheck() {
+ @Override
+ protected boolean check() {
+ return mAccessibilityManager.isTouchExplorationEnabled();
+ }
+ }.run();
}
public void testGetInstalledAccessibilityServicesList() throws Exception {
diff --git a/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java b/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java
index 73883e2..5cac9f9 100644
--- a/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java
+++ b/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java
@@ -30,7 +30,7 @@
public class AccessibilityNodeInfoTest extends AndroidTestCase {
/** The number of properties of the {@link AccessibilityNodeInfo} class. */
- private static final int NON_STATIC_FIELD_COUNT = 17;
+ private static final int NON_STATIC_FIELD_COUNT = 19;
@SmallTest
public void testMarshaling() throws Exception {
diff --git a/tests/tests/accessibilityservice/res/layout/accessibility_view_tree_reporting_test.xml b/tests/tests/accessibilityservice/res/layout/accessibility_view_tree_reporting_test.xml
index bccb563..26f60bf 100644
--- a/tests/tests/accessibilityservice/res/layout/accessibility_view_tree_reporting_test.xml
+++ b/tests/tests/accessibilityservice/res/layout/accessibility_view_tree_reporting_test.xml
@@ -20,6 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
+ android:importantForAccessibility="no"
android:contentDescription="@string/firstLinearLayout" >
<TextView
@@ -48,6 +49,7 @@
android:id="@+id/secondFrameLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:importantForAccessibility="no"
android:contentDescription="@string/secondFrameLayout" >
<LinearLayout
diff --git a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
index 6e4307f..e0ec789 100644
--- a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
+++ b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
@@ -377,7 +377,7 @@
AccessibilityService.GLOBAL_ACTION_RECENTS));
// Sleep a bit so the recents UI is shown.
- SystemClock.sleep(200);
+ SystemClock.sleep(3000);
// Clean up.
getInteractionBridge().performGlobalAction(AccessibilityService.GLOBAL_ACTION_HOME);
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
index 1a8b3a8..e8e32ee 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
@@ -31,8 +31,8 @@
* BluetoothAdapter}.
*/
public class BasicAdapterTest extends AndroidTestCase {
- private static final int DISABLE_TIMEOUT = 20000; // ms timeout for BT disable
- private static final int ENABLE_TIMEOUT = 20000; // ms timeout for BT enable
+ private static final int DISABLE_TIMEOUT = 60000; // ms timeout for BT disable
+ private static final int ENABLE_TIMEOUT = 60000; // ms timeout for BT enable
private static final int POLL_TIME = 400; // ms to poll BT state
private boolean mHasBluetooth;
diff --git a/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java b/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java
index aa161a2..3a0e2af 100644
--- a/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java
+++ b/tests/tests/holo/src/android/holo/cts/LayoutAdapter.java
@@ -52,7 +52,7 @@
private static final int SHORT_TIMEOUT_MS = 500;
/** Longer timeout for widgets that have one-time animations. */
- private static final int LONG_TIMEOUT_MS = 3000;
+ private static final int LONG_TIMEOUT_MS = 6000;
static class LayoutInfo {
private final int mDisplayName;
diff --git a/tests/tests/mediastress/AndroidManifest.xml b/tests/tests/mediastress/AndroidManifest.xml
index 1ee4104..7388fe3 100644
--- a/tests/tests/mediastress/AndroidManifest.xml
+++ b/tests/tests/mediastress/AndroidManifest.xml
@@ -28,7 +28,8 @@
<uses-library android:name="android.test.runner" />
<activity android:label="@string/app_name"
android:name="android.mediastress.cts.MediaFrameworkTest"
- android:screenOrientation="landscape">
+ android:screenOrientation="landscape"
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/>
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaActivity.java b/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaActivity.java
index 6a34f88..4232fbf 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaActivity.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaActivity.java
@@ -18,6 +18,7 @@
package android.mediastress.cts;
import android.app.Activity;
+import android.content.res.Configuration;
import android.graphics.SurfaceTexture;
import android.media.CamcorderProfile;
import android.os.Bundle;
@@ -61,6 +62,12 @@
setContentView(mGLView);
}
+ @Override
+ public void onConfigurationChanged(Configuration newConfig) {
+ Log.w(TAG, "configuration changed " + newConfig.orientation);
+ super.onConfigurationChanged(newConfig);
+ }
+
/**
* should be called by GLThread after GlSurface is created.
*/