Merge "Some Holo Test Improvements" into jb-mr1-dev
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 6cd196c..de7e2bd 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -18,7 +18,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.cts.verifier"
android:versionCode="1"
- android:versionName="4.2_r3">
+ android:versionName="4.2_r4">
<!-- Using 10 for more complete NFC support... -->
<uses-sdk android:minSdkVersion="10"></uses-sdk>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
index 3ea9451..afbf97e 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
@@ -168,6 +168,10 @@
new Feature(PackageManager.FEATURE_WIFI_DIRECT, false),
};
+ public static final Feature[] ALL_JELLY_BEAN_FEATURES = {
+ new Feature(PackageManager.FEATURE_TELEVISION, false),
+ };
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -198,6 +202,9 @@
// add features from latest to last so that the latest requirements are put in the set first
int apiVersion = Build.VERSION.SDK_INT;
+ if (apiVersion >= Build.VERSION_CODES.JELLY_BEAN) {
+ Collections.addAll(features, ALL_JELLY_BEAN_FEATURES);
+ }
if (apiVersion >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
Collections.addAll(features, ALL_ICE_CREAM_SANDWICH_FEATURES);
}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/location/LocationVerifier.java b/apps/CtsVerifier/src/com/android/cts/verifier/location/LocationVerifier.java
index b6d2a9e..3315ba3 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/location/LocationVerifier.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/location/LocationVerifier.java
@@ -35,9 +35,13 @@
/** Timing failures on first NUM_IGNORED_UPDATES updates are ignored. */
private static final int NUM_IGNORED_UPDATES = 2;
- /* The mean computed for the deltas should not be smaller
- * than mInterval * MIN_MEAN_RATIO */
- private static final double MIN_MEAN_RATIO = 0.75;
+ /* In active mode, the mean computed for the deltas should not be smaller
+ * than mInterval * ACTIVE_MIN_MEAN_RATIO */
+ private static final double ACTIVE_MIN_MEAN_RATIO = 0.75;
+
+ /* In passive mode, the mean computed for the deltas should not be smaller
+ * than mInterval * PASSIVE_MIN_MEAN_RATIO */
+ private static final double PASSIVE_MIN_MEAN_RATIO = 0.1;
/**
* The standard deviation computed for the deltas should not be bigger
@@ -90,8 +94,8 @@
mCb.log("active " + mProvider + " update (" + delta + "ms)");
if (mNumActiveUpdates >= mRequestedUpdates) {
- assertMeanAndStdev(mProvider, mActiveDeltas);
- assertMeanAndStdev(LocationManager.PASSIVE_PROVIDER, mPassiveDeltas);
+ assertMeanAndStdev(mProvider, mActiveDeltas, ACTIVE_MIN_MEAN_RATIO);
+ assertMeanAndStdev(LocationManager.PASSIVE_PROVIDER, mPassiveDeltas, PASSIVE_MIN_MEAN_RATIO);
pass();
}
}
@@ -104,11 +108,11 @@
public void onProviderDisabled(String provider) { }
}
- private void assertMeanAndStdev(String provider, List<Long> deltas) {
+ private void assertMeanAndStdev(String provider, List<Long> deltas, double minMeanRatio) {
double mean = computeMean(deltas);
double stdev = computeStdev(mean, deltas);
- double minMean = mInterval * MIN_MEAN_RATIO;
+ double minMean = mInterval * minMeanRatio;
if (mean < minMean) {
fail(provider + " provider mean too small: " + mean
+ " (min: " + minMean + ")");
diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index 31445f7..7ba6133 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -360,6 +360,7 @@
"/data/drm/IDM/HTTP",
"/data/drm/rights",
"/data/dump",
+ "/data/efslog",
"/data/emt",
"/data/factory",
"/data/fics",
@@ -376,6 +377,8 @@
"/data/install",
"/data/internal-device",
"/data/internal-device/DCIM",
+ "/data/last_alog",
+ "/data/last_klog",
"/data/local",
"/data/local/logs",
"/data/local/logs/kernel",