diff options
| author | Todd Kennedy <toddke@google.com> | 2015-10-01 14:15:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-01 14:15:43 +0000 |
| commit | 819f96bd21a09b1bef7d473bee554f8677d6928c (patch) | |
| tree | ccfd8f5a9d1e062c930e90dddc12b9f53474cccd /src/com/android/packageinstaller/PackageInstallerActivity.java | |
| parent | 0b18952fce36a9ca0f3e633319f3181c38a6f861 (diff) | |
| parent | 90db3052f5a010f6016d117ac46267845a7a2f08 (diff) | |
| download | android_packages_apps_PackageInstaller-819f96bd21a09b1bef7d473bee554f8677d6928c.tar.gz android_packages_apps_PackageInstaller-819f96bd21a09b1bef7d473bee554f8677d6928c.tar.bz2 android_packages_apps_PackageInstaller-819f96bd21a09b1bef7d473bee554f8677d6928c.zip | |
Merge "Use PackageInstaller.Session"
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) { |