summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip P. Moltmann <moltmann@google.com>2016-08-31 10:27:05 -0700
committerPhilip P. Moltmann <moltmann@google.com>2016-09-01 21:23:51 +0000
commitd7d3b73bd639b3aae6d246c22aee65e786a0c68f (patch)
tree3a91050a30b38064f6e5f1fa53516aea8595d50f
parent5fe91f8d06533ac37da8d334b36565b7d711541d (diff)
downloadandroid_packages_apps_PackageInstaller-d7d3b73bd639b3aae6d246c22aee65e786a0c68f.tar.gz
android_packages_apps_PackageInstaller-d7d3b73bd639b3aae6d246c22aee65e786a0c68f.tar.bz2
android_packages_apps_PackageInstaller-d7d3b73bd639b3aae6d246c22aee65e786a0c68f.zip
Resolve merge conflict from Ia3d8f54624801696eaec4f9216d7bbefb0b105a4.
Bug: 30056625 Change-Id: Ie8e46fc7a2c340fb04b64feb331af0d882fe9672
-rwxr-xr-xsrc/com/android/packageinstaller/InstallAppProgress.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java
index 92594e35..3a9daa69 100755
--- a/src/com/android/packageinstaller/InstallAppProgress.java
+++ b/src/com/android/packageinstaller/InstallAppProgress.java
@@ -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.");