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

Commit 739cdab7 authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge "Do not deference before null check" into gingerbread

parents 1540a7ea 930d3af7

core/java/android/content/pm/PackageParser.java

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ public class PackageParser { 
     * location from the apk location at the given file path.

     * @param packageFilePath file location of the apk

     * @param flags Special parse flags

     * @return PackageLite object with package information.

     * @return PackageLite object with package information or null on failure.

     */

    public static PackageLite parsePackageLite(String packageFilePath, int flags) {

        XmlResourceParser parser = null;

packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java

+1 −2
Original line number Diff line number Diff line
@@ -125,8 +125,6 @@ public class DefaultContainerService extends IntentService { 
            metrics.setToDefaults();

            PackageParser.PackageLite pkg = packageParser.parsePackageLite(

                    archiveFilePath, 0);

            ret.packageName = pkg.packageName;

            ret.installLocation = pkg.installLocation;

            // Nuke the parser reference right away and force a gc

            packageParser = null;

            Runtime.getRuntime().gc();
@@ -136,6 +134,7 @@ public class DefaultContainerService extends IntentService { 
                return ret;

            }

            ret.packageName = pkg.packageName;

            ret.installLocation = pkg.installLocation;

            ret.recommendedInstallLocation = recommendAppInstallLocation(pkg.installLocation, archiveFilePath, flags);

            return ret;

        }