Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fdcadf2 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

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

* commit '9a671137':
  Set tmpdir to application cache directory.
parents 40e07b9c 9a671137

core/java/android/app/ActivityThread.java

+12 −10
Original line number Original line Diff line number Diff line
@@ -3843,7 +3843,7 @@ public final class ActivityThread { 
        windowManager.endTrimMemory();        

        windowManager.endTrimMemory();        

    }

    }





    private void setupGraphicsSupport(LoadedApk info) {

    private void setupGraphicsSupport(LoadedApk info, File cacheDir) {

        if (Process.isIsolated()) {

        if (Process.isIsolated()) {

            // Isolated processes aren't going to do UI.

            // Isolated processes aren't going to do UI.

            return;

            return;
@@ -3855,11 +3855,8 @@ public final class ActivityThread { 
            // If there are several packages in this application we won't

            // If there are several packages in this application we won't

            // initialize the graphics disk caches 

            // initialize the graphics disk caches 

            if (packages != null && packages.length == 1) {

            if (packages != null && packages.length == 1) {

                ContextImpl appContext = new ContextImpl();

                HardwareRenderer.setupDiskCache(cacheDir);

                appContext.init(info, null, this);

                RenderScript.setupDiskCache(cacheDir);



                HardwareRenderer.setupDiskCache(appContext.getCacheDir());

                RenderScript.setupDiskCache(appContext.getCacheDir());

            }

            }

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            // Ignore

            // Ignore
@@ -3925,7 +3922,14 @@ public final class ActivityThread { 




        data.info = getPackageInfoNoCheck(data.appInfo, data.compatInfo);

        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

         * For system applications on userdebug/eng builds, log stack
@@ -4003,8 +4007,6 @@ public final class ActivityThread { 
        }

        }





        if (data.instrumentationName != null) {

        if (data.instrumentationName != null) {

            ContextImpl appContext = new ContextImpl();

            appContext.init(data.info, null, this);

            InstrumentationInfo ii = null;

            InstrumentationInfo ii = null;

            try {

            try {

                ii = appContext.getPackageManager().

                ii = appContext.getPackageManager().