summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-03-11 15:21:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-11 15:21:04 +0000
commit4645c5ba33e6b8c2623f8e3c86d4ed584f9708a9 (patch)
tree4e9f0ecfcce6aaef3a7e74b2f5fae07a75fae8ec
parentad35099a87b52e1df86237911eecda5e12961ee4 (diff)
parenta870652789cc2b06b921fe66aa1bf48d4fc3e97c (diff)
downloadframeworks_base-4645c5ba33e6b8c2623f8e3c86d4ed584f9708a9.zip
frameworks_base-4645c5ba33e6b8c2623f8e3c86d4ed584f9708a9.tar.gz
frameworks_base-4645c5ba33e6b8c2623f8e3c86d4ed584f9708a9.tar.bz2
am a8706527: am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
* commit 'a870652789cc2b06b921fe66aa1bf48d4fc3e97c': Remove java.io.tmpdir assignment in AndroidRuntime (again).
-rw-r--r--core/jni/AndroidRuntime.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 98f7716..b0835ed 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -817,13 +817,6 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
mOptions.add(opt);
}
- /*
- * We don't have /tmp on the device, but we often have an SD card. Apps
- * shouldn't use this, but some test suites might want to exercise it.
- */
- opt.optionString = "-Djava.io.tmpdir=/sdcard";
- mOptions.add(opt);
-
initArgs.version = JNI_VERSION_1_4;
initArgs.options = mOptions.editArray();
initArgs.nOptions = mOptions.size();