commit d7d3b73bd639b3aae6d246c22aee65e786a0c68f
author Philip P. Moltmann <moltmann@google.com> Wed Aug 31 10:27:05 2016 -0700
committer Philip P. Moltmann <moltmann@google.com> Thu Sep 01 21:23:51 2016 +0000
tree 3a91050a30b38064f6e5f1fa53516aea8595d50f
parent 5fe91f8d06533ac37da8d334b36565b7d711541d

Resolve merge conflict from Ia3d8f54624801696eaec4f9216d7bbefb0b105a4.

Bug: 30056625
Change-Id: Ie8e46fc7a2c340fb04b64feb331af0d882fe9672

src/com/android/packageinstaller/InstallAppProgress.java

diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java
index 92594e3..3a9daa6 100755
--- a/src/com/android/packageinstaller/InstallAppProgress.java
+++ b/src/com/android/packageinstaller/InstallAppProgress.java
@@ -358,7 +358,7 @@
             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.");