Merge "Add 31000 (Republic Wireless US) to NO_DELIVERY_REPORTS"
diff --git a/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java b/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
index 3a28fe8..5451472 100644
--- a/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
@@ -242,29 +242,29 @@
}
return values;
}
- private void startAnimation(final ValueAnimator mValueAnimator) throws Throwable {
- this.runTestOnUiThread(new Runnable(){
+
+ private void startAnimation(final ValueAnimator animator) throws Throwable {
+ this.runTestOnUiThread(new Runnable() {
public void run() {
- mActivity.startAnimation(mValueAnimator);
+ mActivity.startAnimation(animator);
}
});
}
- private void endAnimation(final ValueAnimator mValueAnimator) throws Throwable {
- Thread animationRunnable = new Thread() {
+
+ private void endAnimation(final ValueAnimator animator) throws Throwable {
+ this.runTestOnUiThread(new Runnable() {
public void run() {
- mValueAnimator.end();
+ animator.end();
}
- };
- this.runTestOnUiThread(animationRunnable);
+ });
}
- private void cancelAnimation(final ValueAnimator mValueAnimator) throws Throwable {
- Thread animationRunnable = new Thread() {
+ private void cancelAnimation(final ValueAnimator animator) throws Throwable {
+ this.runTestOnUiThread(new Runnable() {
public void run() {
- mValueAnimator.cancel();
+ animator.cancel();
}
- };
- this.runTestOnUiThread(animationRunnable);
+ });
}
private String errorMessage(float[] values) {
diff --git a/tests/tests/app/src/android/app/cts/ApplicationTest.java b/tests/tests/app/src/android/app/cts/ApplicationTest.java
index d48d53a..99cc8ba 100644
--- a/tests/tests/app/src/android/app/cts/ApplicationTest.java
+++ b/tests/tests/app/src/android/app/cts/ApplicationTest.java
@@ -22,6 +22,7 @@
import android.app.Instrumentation;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.test.InstrumentationTestCase;
/**
@@ -41,6 +42,13 @@
assertTrue(mockApp.isConstructorCalled);
assertTrue(mockApp.isOnCreateCalled);
+ //skip if the device doesn't support both of portrait and landscape orientation screens.
+ final PackageManager pm = targetContext.getPackageManager();
+ if(!(pm.hasSystemFeature(PackageManager.FEATURE_SCREEN_LANDSCAPE)
+ && pm.hasSystemFeature(PackageManager.FEATURE_SCREEN_PORTRAIT))){
+ return;
+ }
+
runTestOnUiThread(new Runnable() {
public void run() {
OrientationTestUtils.toggleOrientation(activity);
diff --git a/tests/tests/app/src/android/app/cts/DialogTest.java b/tests/tests/app/src/android/app/cts/DialogTest.java
index 57ae218..1f6e2ab 100644
--- a/tests/tests/app/src/android/app/cts/DialogTest.java
+++ b/tests/tests/app/src/android/app/cts/DialogTest.java
@@ -25,6 +25,7 @@
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnDismissListener;
import android.content.DialogInterface.OnKeyListener;
+import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.cts.util.PollingCheck;
@@ -205,6 +206,13 @@
assertFalse(d.isOnSaveInstanceStateCalled);
assertFalse(TestDialog.isOnRestoreInstanceStateCalled);
+ //skip if the device doesn't support both of portrait and landscape orientation screens.
+ final PackageManager pm = mContext.getPackageManager();
+ if(!(pm.hasSystemFeature(PackageManager.FEATURE_SCREEN_LANDSCAPE)
+ && pm.hasSystemFeature(PackageManager.FEATURE_SCREEN_PORTRAIT))){
+ return;
+ }
+
OrientationTestUtils.toggleOrientationSync(mActivity, mInstrumentation);
assertTrue(d.isOnSaveInstanceStateCalled);
diff --git a/tests/tests/location/src/android/location/cts/LocationManagerTest.java b/tests/tests/location/src/android/location/cts/LocationManagerTest.java
index 07091cc..b316e55 100755
--- a/tests/tests/location/src/android/location/cts/LocationManagerTest.java
+++ b/tests/tests/location/src/android/location/cts/LocationManagerTest.java
@@ -37,6 +37,7 @@
import android.test.InstrumentationTestCase;
import java.util.List;
+import java.lang.Thread;
/**
* Requires the permissions
@@ -606,6 +607,9 @@
// now update to trigger exit proximity proximity
mIntentReceiver.clearReceivedIntents();
+
+ // delay 2 seconds since location update in less than 1s will be neglected.
+ Thread.sleep(2000);
updateLocation(20, 20);
waitForReceiveBroadcast();
assertProximityType(false);
diff --git a/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
index 99d2e43..4fa69a8 100644
--- a/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -120,9 +120,14 @@
invalidateFeature));
}
- // Should return failure(-1) because MMS is not supported on WIFI.
- assertEquals(failureCode, mCm.startUsingNetworkFeature(TYPE_WIFI, mmsFeature));
- assertEquals(failureCode, mCm.stopUsingNetworkFeature(TYPE_WIFI, mmsFeature));
+ ni = mCm.getNetworkInfo(TYPE_WIFI);
+ if (ni != null) {
+ // Should return failure(-1) because MMS is not supported on WIFI.
+ assertEquals(failureCode, mCm.startUsingNetworkFeature(TYPE_WIFI,
+ mmsFeature));
+ assertEquals(failureCode, mCm.stopUsingNetworkFeature(TYPE_WIFI,
+ mmsFeature));
+ }
}
public void testRequestRouteToHost() {
diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index e8d2c70..51f7e7e 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -299,6 +299,9 @@
"/data/misc/bluetooth",
"/data/misc/dhcp",
"/data/misc/lockscreen",
+ "/data/misc/webwidgets",
+ "/data/misc/webwidgets/chess",
+ "/data/misc/widgets",
"/data/misc/wifi",
"/data/misc/wifi/sockets",
"/data/misc/wimax",
diff --git a/tests/tests/security/src/android/security/cts/CertificateData.java b/tests/tests/security/src/android/security/cts/CertificateData.java
index c3f1901..1714461 100644
--- a/tests/tests/security/src/android/security/cts/CertificateData.java
+++ b/tests/tests/security/src/android/security/cts/CertificateData.java
@@ -41,6 +41,7 @@
"43:F9:B1:10:D5:BA:FD:48:22:52:31:B0:D0:08:2B:37:2F:EF:9A:54",
"F4:8B:11:BF:DE:AB:BE:94:54:20:71:E6:41:DE:6B:BE:88:2B:40:B9",
"96:56:CD:7B:57:96:98:95:D0:E1:41:46:68:06:FB:B8:C6:11:06:87",
+ "55:A6:72:3E:CB:F2:EC:CD:C3:23:74:70:19:9D:2A:BE:11:E3:81:D1",
"D6:9B:56:11:48:F0:1C:77:C5:45:78:C1:09:26:DF:5B:85:69:76:AD",
"78:6A:74:AC:76:AB:14:7F:9C:6A:30:50:BA:9E:A8:7E:FE:9A:CE:3C",
"27:96:BA:E6:3F:18:01:E2:77:26:1B:A0:D7:77:70:02:8F:20:EE:E4",
diff --git a/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
index 3c8e649..3a8d87f 100755
--- a/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
@@ -74,6 +74,8 @@
"44076", // KDDI
"311870", // Boost Mobile
"311220", // USCC
+ "311225", // USCC LTE
+ "311580", // USCC LTE
"302720", // Rogers
"30272", // Rogers
"302370", // Fido
diff --git a/tests/tests/view/src/android/view/animation/cts/AnimationUtilsTest.java b/tests/tests/view/src/android/view/animation/cts/AnimationUtilsTest.java
index e2fe6f35..cddbfdf 100644
--- a/tests/tests/view/src/android/view/animation/cts/AnimationUtilsTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/AnimationUtilsTest.java
@@ -91,6 +91,10 @@
long time2 = 0L;
for (int i = 0; i < 1000 && time1 >= time2; i++) {
time2 = AnimationUtils.currentAnimationTimeMillis();
+ try {
+ Thread.sleep(1);
+ } catch (java.lang.InterruptedException e) {
+ }
assertTrue(time2 > 0);
}
assertTrue(time2 > time1);
