diff options
| author | Todd Kennedy <toddke@google.com> | 2015-08-07 11:14:22 -0700 |
|---|---|---|
| committer | Todd Kennedy <toddke@google.com> | 2016-01-07 13:46:53 -0800 |
| commit | 06163dec5a23bb3f17f7e6279f6d46e1851b7d16 (patch) | |
| tree | 0d0be561a08a4aeb829f3d0d03a5b2cfec4a30b5 /src/com/android/packageinstaller/PackageInstallerActivity.java | |
| parent | 2c154d2efbd452543f4cbe5a431cf0403161066a (diff) | |
| download | android_packages_apps_PackageInstaller-06163dec5a23bb3f17f7e6279f6d46e1851b7d16.tar.gz android_packages_apps_PackageInstaller-06163dec5a23bb3f17f7e6279f6d46e1851b7d16.tar.bz2 android_packages_apps_PackageInstaller-06163dec5a23bb3f17f7e6279f6d46e1851b7d16.zip | |
Use PackageInstaller.Session
We've been using the deprecated package manager installation methods.
Replace those with the PackageInstaller.Session installation
mechanism.
Bug: 22282121
Change-Id: I34aefcbae2703c400a7ed35780f61713992b7181
Diffstat (limited to 'src/com/android/packageinstaller/PackageInstallerActivity.java')
| -rw-r--r-- | src/com/android/packageinstaller/PackageInstallerActivity.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index 868872a9..3ea3959d 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -438,7 +438,13 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen mInstallFlowAnalytics.setSystemApp( (mAppInfo != null) && ((mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0)); - startInstallConfirm(); + // If we have a session id, we're invoked to verify the permissions for the given + // package. Otherwise, we start the install process. + if (mSessionId != -1) { + startInstallConfirm(); + } else { + startInstall(); + } } void setPmResult(int pmResult) { @@ -688,7 +694,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen } else { mScrollView.pageScroll(View.FOCUS_DOWN); } - } else if(v == mCancel) { + } else if (v == mCancel) { // Cancel and finish setResult(RESULT_CANCELED); if (mSessionId != -1) { |