Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set $TMPDIR as well as java.io.tmpdir." am: 1353c41379 am: 76aa934468 am: 522439015a am: 08f7be5495

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1821337

Change-Id: Ibe83032e2aec458bad38d327a10b970f05023b5c
This commit is contained in:
Elliott Hughes
2021-09-14 18:18:17 +00:00
committed by Automerger Merge Worker
parent 2cd88e833b 08f7be5495
commit 0eb82632c9
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/ActivityThread.java
View File

@@ -6343,7 +6343,13 @@ public final class ActivityThread extends ClientTransactionHandler
final File cacheDir = context.getCacheDir();
if (cacheDir != null) {
// Provide a usable directory for temporary files
System.setProperty("java.io.tmpdir", cacheDir.getAbsolutePath());
String tmpdir = cacheDir.getAbsolutePath();
System.setProperty("java.io.tmpdir", tmpdir);
try {
android.system.Os.setenv("TMPDIR", tmpdir, true);
} catch (ErrnoException ex) {
Log.w(TAG, "Unable to initialize $TMPDIR", ex);
}
} else {
Log.v(TAG, "Unable to initialize \"java.io.tmpdir\" property "
+ "due to missing cache directory");

5
core/tests/coretests/src/android/app/activity/ActivityThreadTest.java
View File

@@ -107,6 +107,11 @@ public class ActivityThreadTest {
}
}
@Test
public void testTemporaryDirectory() throws Exception {
assertEquals(System.getProperty("java.io.tmpdir"), System.getenv("TMPDIR"));
}
@Test
public void testDoubleRelaunch() throws Exception {
final Activity activity = mActivityTestRule.launchActivity(new Intent());