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

Commit 9847c89b authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Resolve merge conflict from Ia3d8f54624801696eaec4f9216d7bbefb0b105a4. am:... 

Resolve merge conflict from Ia3d8f54624801696eaec4f9216d7bbefb0b105a4. am: d7d3b73b am: 729cff27
am: 14d1b7a4

Change-Id: I264aa0972654a74c386ecbc0c679331d9cb06b28
parents 0615b4f9 14d1b7a4

src/com/android/packageinstaller/InstallAppProgress.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -358,7 +358,7 @@ public class InstallAppProgress extends Activity implements View.OnClickListener 
            File file = new File(mPackageURI.getPath());

            File file = new File(mPackageURI.getPath());

            try {

            try {

                PackageLite pkg = PackageParser.parsePackageLite(file, 0);

                PackageLite pkg = PackageParser.parsePackageLite(file, 0);

                params.sessionParams.setAppPackageName(pkg.packageName);

                params.setAppPackageName(pkg.packageName);

                params.setInstallLocation(pkg.installLocation);

                params.setInstallLocation(pkg.installLocation);

            } catch (PackageParser.PackageParserException e) {

            } catch (PackageParser.PackageParserException e) {

                Log.e(TAG, "Cannot parse package " + file + ". Assuming defaults.");

                Log.e(TAG, "Cannot parse package " + file + ". Assuming defaults.");