Skip to content

Commit a84b5f3

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
Remove handling of obsolete Android versions whose temporary directory is /sdcard.
This handling was added in feb83a1. It became unnecessary once [our minSdkVersion hit 16](#4011 (comment)), as it did years ago. (I was reminded of this while reviewing #7986 for #5756.) RELNOTES=n/a PiperOrigin-RevId: 811449148
1 parent 9a406e7 commit a84b5f3

File tree

4 files changed

+0
-30
lines changed

4 files changed

+0
-30
lines changed

android/guava-tests/test/com/google/common/io/FileBackedOutputStreamTest.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.common.io;
1818

19-
import static com.google.common.base.StandardSystemProperty.JAVA_IO_TMPDIR;
2019
import static com.google.common.base.StandardSystemProperty.OS_NAME;
2120
import static com.google.common.truth.Truth.assertThat;
2221
import static java.lang.Math.min;
@@ -73,10 +72,6 @@ private void testThreshold(
7372

7473
// Write data to go over the threshold
7574
if (chunk2 > 0) {
76-
if (JAVA_IO_TMPDIR.value().equals("/sdcard")) {
77-
assertThrows(IOException.class, () -> write(out, data, chunk1, chunk2, singleByte));
78-
return;
79-
}
8075
write(out, data, chunk1, chunk2, singleByte);
8176
file = out.getFile();
8277
assertEquals(dataSize, file.length());
@@ -132,10 +127,6 @@ public void testWriteErrorAfterClose() throws Exception {
132127
FileBackedOutputStream out = new FileBackedOutputStream(50);
133128
ByteSource source = out.asByteSource();
134129

135-
if (JAVA_IO_TMPDIR.value().equals("/sdcard")) {
136-
assertThrows(IOException.class, () -> out.write(data));
137-
return;
138-
}
139130
out.write(data);
140131
assertTrue(Arrays.equals(data, source.read()));
141132

android/guava-tests/test/com/google/common/io/FilesCreateTempDirTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@
1616

1717
package com.google.common.io;
1818

19-
import static com.google.common.base.StandardSystemProperty.JAVA_IO_TMPDIR;
2019
import static com.google.common.base.StandardSystemProperty.JAVA_SPECIFICATION_VERSION;
2120
import static com.google.common.base.StandardSystemProperty.OS_NAME;
2221
import static com.google.common.truth.Truth.assertThat;
2322
import static java.nio.file.attribute.PosixFilePermission.OWNER_EXECUTE;
2423
import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
2524
import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
26-
import static org.junit.Assert.assertThrows;
2725

2826
import java.io.File;
2927
import java.io.IOException;
@@ -42,10 +40,6 @@
4240
@NullUnmarked
4341
public class FilesCreateTempDirTest extends TestCase {
4442
public void testCreateTempDir() throws IOException {
45-
if (JAVA_IO_TMPDIR.value().equals("/sdcard")) {
46-
assertThrows(IllegalStateException.class, Files::createTempDir);
47-
return;
48-
}
4943
File temp = Files.createTempDir();
5044
try {
5145
assertThat(temp.exists()).isTrue();

guava-tests/test/com/google/common/io/FileBackedOutputStreamTest.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.common.io;
1818

19-
import static com.google.common.base.StandardSystemProperty.JAVA_IO_TMPDIR;
2019
import static com.google.common.base.StandardSystemProperty.OS_NAME;
2120
import static com.google.common.truth.Truth.assertThat;
2221
import static java.lang.Math.min;
@@ -73,10 +72,6 @@ private void testThreshold(
7372

7473
// Write data to go over the threshold
7574
if (chunk2 > 0) {
76-
if (JAVA_IO_TMPDIR.value().equals("/sdcard")) {
77-
assertThrows(IOException.class, () -> write(out, data, chunk1, chunk2, singleByte));
78-
return;
79-
}
8075
write(out, data, chunk1, chunk2, singleByte);
8176
file = out.getFile();
8277
assertEquals(dataSize, file.length());
@@ -132,10 +127,6 @@ public void testWriteErrorAfterClose() throws Exception {
132127
FileBackedOutputStream out = new FileBackedOutputStream(50);
133128
ByteSource source = out.asByteSource();
134129

135-
if (JAVA_IO_TMPDIR.value().equals("/sdcard")) {
136-
assertThrows(IOException.class, () -> out.write(data));
137-
return;
138-
}
139130
out.write(data);
140131
assertTrue(Arrays.equals(data, source.read()));
141132

guava-tests/test/com/google/common/io/FilesCreateTempDirTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@
1616

1717
package com.google.common.io;
1818

19-
import static com.google.common.base.StandardSystemProperty.JAVA_IO_TMPDIR;
2019
import static com.google.common.base.StandardSystemProperty.JAVA_SPECIFICATION_VERSION;
2120
import static com.google.common.base.StandardSystemProperty.OS_NAME;
2221
import static com.google.common.truth.Truth.assertThat;
2322
import static java.nio.file.attribute.PosixFilePermission.OWNER_EXECUTE;
2423
import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
2524
import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
26-
import static org.junit.Assert.assertThrows;
2725

2826
import java.io.File;
2927
import java.io.IOException;
@@ -42,10 +40,6 @@
4240
@NullUnmarked
4341
public class FilesCreateTempDirTest extends TestCase {
4442
public void testCreateTempDir() throws IOException {
45-
if (JAVA_IO_TMPDIR.value().equals("/sdcard")) {
46-
assertThrows(IllegalStateException.class, Files::createTempDir);
47-
return;
48-
}
4943
File temp = Files.createTempDir();
5044
try {
5145
assertThat(temp.exists()).isTrue();

0 commit comments

Comments
 (0)