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

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

Resolve merge conflict from Ia3d8f54624801696eaec4f9216d7bbefb0b105a4.

am: d7d3b73b

Change-Id: I4a72e89f7a05c72ab7e47c01fc76ff5099e34a94
parents 549ddb5b d7d3b73b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ public class InstallAppProgress extends Activity implements View.OnClickListener
            File file = new File(mPackageURI.getPath());
            try {
                PackageLite pkg = PackageParser.parsePackageLite(file, 0);
                params.sessionParams.setAppPackageName(pkg.packageName);
                params.setAppPackageName(pkg.packageName);
                params.setInstallLocation(pkg.installLocation);
            } catch (PackageParser.PackageParserException e) {
                Log.e(TAG, "Cannot parse package " + file + ". Assuming defaults.");