Projects >> android-frameworks-base-with-screenshot-tweaks >>c32e190ea6da8c9acd8dc1a29a6e8794ecf7d857

Chunk
Conflicting content 
            }
        }

<<<<<<< HEAD
=======
        @Override
        public void clearDirectory(String path) throws RemoteException {
            Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);

            final File directory = new File(path);
            if (directory.exists() && directory.isDirectory()) {
                eraseFiles(directory);
            }
        }
>>>>>>> a9c3846194b69f1bfa73066be670c9d77f6dd0d7
    };

    public DefaultContainerService() {
Solution content 
            }
        }

        @Override
        public void clearDirectory(String path) throws RemoteException {
            Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);

            final File directory = new File(path);
            if (directory.exists() && directory.isDirectory()) {
                eraseFiles(directory);
            }
        }
    };

    public DefaultContainerService() {
File
DefaultContainerService.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration