am 141f40ec: (-s ours) am df20ad8e: (-s ours) am b7377cc8: (-s ours) am 6fb729dd: Merge "blacklist android.provider.cts.CalendarTest#testEventColors DO NOT MERGE" into jb-dev
* commit '141f40ec900352901d99b2895c16e91d8bdaa080':
diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index a4543c5..3d59123 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -585,12 +585,20 @@
return retval;
}
+ public void testSystemMountedRO() throws IOException {
+ assertSystemMountedROIn("/proc/self/mounts");
+ }
+
+ public void testSystemMountedRO_init() throws IOException {
+ assertSystemMountedROIn("/proc/1/mounts");
+ }
+
/**
- * Scan through /proc/self/mounts, looking for the /system line. If the line
+ * Scan through {@code filename}, looking for the /system line. If the line
* has "ro" in the 4th column, then we know the filesystem is mounted read-only.
*/
- public void testSystemMountedRO() throws IOException {
- BufferedReader br = new BufferedReader(new FileReader("/proc/self/mounts"));
+ private static void assertSystemMountedROIn(String filename) throws IOException {
+ BufferedReader br = new BufferedReader(new FileReader(filename));
String line;
boolean foundSystem = false;
while((line = br.readLine()) != null) {
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
index 6674bdf..8fb2f15 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
@@ -31,7 +31,7 @@
@Option(name="cts-install-path", description="the path to the cts installation to use")
private String mCtsRootDirPath = System.getProperty("CTS_ROOT");
- public static final String CTS_BUILD_VERSION = "4.2_r1";
+ public static final String CTS_BUILD_VERSION = "4.2_r2";
/**
* {@inheritDoc}