diff options
author | Todd Kennedy <toddke@google.com> | 2015-08-07 11:14:22 -0700 |
---|---|---|
committer | Todd Kennedy <toddke@google.com> | 2015-09-30 14:34:38 -0700 |
commit | 90db3052f5a010f6016d117ac46267845a7a2f08 (patch) | |
tree | 6755838eba4ed465f2e68e052ff1caf11dff1112 /src/com/android/packageinstaller/PackageInstallerActivity.java | |
parent | b080948694e52f523150c00728183469fa320724 (diff) | |
download | android_packages_apps_PackageInstaller-90db3052f5a010f6016d117ac46267845a7a2f08.tar.gz android_packages_apps_PackageInstaller-90db3052f5a010f6016d117ac46267845a7a2f08.tar.bz2 android_packages_apps_PackageInstaller-90db3052f5a010f6016d117ac46267845a7a2f08.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 6bcd80e4..a3462c09 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -425,7 +425,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) { @@ -668,7 +674,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) { |