Projects >> android-frameworks-base >>18803d37e2ce47407b7ac52513e3254207e8b287

Chunk
Conflicting content 
    }
    
        return performed ? DEX_OPT_PERFORMED : DEX_OPT_SKIPPED;
    }

<<<<<<< HEAD
    private static boolean useEncryptedFilesystemForPackage(PackageParser.Package pkg) {
        return Environment.isEncryptedFilesystemEnabled() &&
                ((pkg.applicationInfo.flags & ApplicationInfo.FLAG_NEVER_ENCRYPT) == 0);
=======
>>>>>>> 5a2fdbba3d7c19a03380f37338b84cbe2d47f055
    private PackageParser.Package scanPackageLI(
        File scanFile, File destCodeFile, File destResourceFile,
        PackageParser.Package pkg, int parseFlags, int scanMode) {
Solution content 
        return performed ? DEX_OPT_PERFORMED : DEX_OPT_SKIPPED;
    }

    private static boolean useEncryptedFilesystemForPackage(PackageParser.Package pkg) {
        return Environment.isEncryptedFilesystemEnabled() &&
                ((pkg.applicationInfo.flags & ApplicationInfo.FLAG_NEVER_ENCRYPT) == 0);
    }
    
    private PackageParser.Package scanPackageLI(
        File scanFile, File destCodeFile, File destResourceFile,
        PackageParser.Package pkg, int parseFlags, int scanMode) {
File
PackageManagerService.java
Developer's decision
Version 1
Kind of conflict
Method declaration