merge in ics-mr1-release history after reset to ics-mr1
diff --git a/tests/tests/os/src/android/os/cts/BuildVersionTest.java b/tests/tests/os/src/android/os/cts/BuildVersionTest.java
index a317dce..6cb09bb 100644
--- a/tests/tests/os/src/android/os/cts/BuildVersionTest.java
+++ b/tests/tests/os/src/android/os/cts/BuildVersionTest.java
@@ -29,7 +29,7 @@
private static final String LOG_TAG = "BuildVersionTest";
private static final Set<String> EXPECTED_RELEASES =
- new HashSet<String>(Arrays.asList("4.0.3"));
+ new HashSet<String>(Arrays.asList("4.0.3", "4.0.4"));
private static final int EXPECTED_SDK = 15;
@SuppressWarnings("deprecation")
diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index 0c7e5ba..3636225 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -223,6 +223,12 @@
"/data/hwvefs",
"/data/htcfs",
"/data/local",
+ "/data/local/logs",
+ "/data/local/logs/kernel",
+ "/data/local/logs/logcat",
+ "/data/local/logs/resetlog",
+ "/data/local/logs/smem",
+ "/data/local/rwsystag",
"/data/local/tmp",
"/data/local/tmp/com.nuance.android.vsuite.vsuiteapp",
"/data/log",
diff --git a/tools/utils/buildCts.py b/tools/utils/buildCts.py
index 3e83343..98978fd 100755
--- a/tools/utils/buildCts.py
+++ b/tools/utils/buildCts.py
@@ -106,14 +106,11 @@
packages.append(doc.GetAttr('TestPackage', 'appPackageName'))
plan = tools.TestPlan(packages)
- plan.Exclude(r'android\.core\.vm-tests-tf')
- plan.Exclude('android\.performance.*')
- self.__WritePlan(plan, 'CTS')
-
plan.Exclude('android\.core\.vm-tests')
plan.Exclude('android\.performance.*')
plan.Include(r'android\.core\.vm-tests-tf')
self.__WritePlan(plan, 'CTS-TF')
+ self.__WritePlan(plan, 'CTS')
plan.Exclude(r'android\.tests\.sigtest')
plan.Exclude(r'android\.core.*')
@@ -124,11 +121,6 @@
self.__WritePlan(plan, 'Java')
plan = tools.TestPlan(packages)
- plan.Include(r'android\.core\.vm-tests')
- plan.Exclude(r'android\.core\.vm-tests-tf')
- self.__WritePlan(plan, 'VM')
-
- plan = tools.TestPlan(packages)
plan.Include(r'android\.core\.vm-tests-tf')
self.__WritePlan(plan, 'VM-TF')