Projects >> android-frameworks-base-with-screenshot-tweaks >>7040ce78666d3307521c6dc6d55c71ea90534a7e

Chunk
Conflicting content
    
    private PackageParser.Package scanPackageLI(
        PackageParser.Package pkg, int parseFlags, int scanMode) {
<<<<<<< HEAD
        File scanFile = new File(pkg.mScanPath);
=======

        if (scanFile == null || destCodeFile == null ||
                destResourceFile == null) {
            // Bail out. The resource and code paths haven't been set.
            Log.w(TAG, " Code and resource paths haven't been set correctly");
            mLastScanError = PackageManager.INSTALL_FAILED_INVALID_APK;
            return null;
        }
>>>>>>> 37a00a36fb69645695b1a165e2fd90cc3eb3e071
        mScanningPath = scanFile;
        if (pkg == null) {
            mLastScanError = PackageManager.INSTALL_PARSE_FAILED_BAD_PACKAGE_NAME;
Solution content
    
    private PackageParser.Package scanPackageLI(
        PackageParser.Package pkg, int parseFlags, int scanMode) {
        File scanFile = new File(pkg.mScanPath);
        if (scanFile == null || pkg.applicationInfo.sourceDir == null ||
                pkg.applicationInfo.publicSourceDir == null) {
            // Bail out. The resource and code paths haven't been set.
            Log.w(TAG, " Code and resource paths haven't been set correctly");
            mLastScanError = PackageManager.INSTALL_FAILED_INVALID_APK;
            return null;
        }
        mScanningPath = scanFile;
        if (pkg == null) {
            mLastScanError = PackageManager.INSTALL_PARSE_FAILED_BAD_PACKAGE_NAME;
File
PackageManagerService.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Variable