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

am 9a671137: Merge "Set tmpdir to application cache directory." into jb-dev

Browse Source 
* commit '9a671137dc95e243009dab34971da75f0d598456':
  Set tmpdir to application cache directory.
This commit is contained in:
Jeff Sharkey
2012-05-02 16:16:11 -07:00
committed by Android Git Automerger
parent 40e07b9ce8 9a671137dc
commit 0fdcadf28e
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3843,7 +3843,7 @@ public final class ActivityThread {
windowManager.endTrimMemory();
}
private void setupGraphicsSupport(LoadedApk info) {
private void setupGraphicsSupport(LoadedApk info, File cacheDir) {
if (Process.isIsolated()) {
// Isolated processes aren't going to do UI.
return;
@@ -3855,11 +3855,8 @@ public final class ActivityThread {
// If there are several packages in this application we won't
// initialize the graphics disk caches
if (packages != null && packages.length == 1) {
ContextImpl appContext = new ContextImpl();
appContext.init(info, null, this);
HardwareRenderer.setupDiskCache(appContext.getCacheDir());
RenderScript.setupDiskCache(appContext.getCacheDir());
HardwareRenderer.setupDiskCache(cacheDir);
RenderScript.setupDiskCache(cacheDir);
}
} catch (RemoteException e) {
// Ignore
@@ -3925,8 +3922,15 @@ public final class ActivityThread {
data.info = getPackageInfoNoCheck(data.appInfo, data.compatInfo);
setupGraphicsSupport(data.info);
final ContextImpl appContext = new ContextImpl();
appContext.init(data.info, null, this);
final File cacheDir = appContext.getCacheDir();
// Provide a usable directory for temporary files
System.setProperty("java.io.tmpdir", cacheDir.getAbsolutePath());
setupGraphicsSupport(data.info, cacheDir);
/**
* For system applications on userdebug/eng builds, log stack
* traces of disk and network access to dropbox for analysis.
@@ -4003,8 +4007,6 @@ public final class ActivityThread {
}
if (data.instrumentationName != null) {
ContextImpl appContext = new ContextImpl();
appContext.init(data.info, null, this);
InstrumentationInfo ii = null;
try {
ii = appContext.getPackageManager().