Projects >> platform_frameworks_base >>4e8cf0c83c974d606812f2d152d7ae9db01570a6

Chunk
Conflicting content
     * @param cacheDir A directory the current process can write to
     */
    public static void setupDiskCache(File cacheDir) {
<<<<<<< HEAD
        if (!sInitialized) {
            Log.e(LOG_TAG, "RenderScript.setupDiskCache() called when disabled");
            return;
        }

        File f = new File(cacheDir, CACHE_PATH);
        mCachePath = f.getAbsolutePath();
        f.mkdirs();
=======
        // Defer creation of cache path to nScriptCCreate().
        mCacheDir = cacheDir;
>>>>>>> 0664479a2bb5dd3341eb666b7ebabaf871c3b95e
    }

    public enum ContextType {
Solution content
     * @param cacheDir A directory the current process can write to
     */
    public static void setupDiskCache(File cacheDir) {
        if (!sInitialized) {
            Log.e(LOG_TAG, "RenderScript.setupDiskCache() called when disabled");
            return;
        }

        // Defer creation of cache path to nScriptCCreate().
        mCacheDir = cacheDir;
    }

    public enum ContextType {
File
RenderScript.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
If statement
Method invocation
Variable