summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2016-06-01 18:43:43 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-01 18:43:43 +0000
commit0f93d6b10a2a94178e905161d84ffb0f9e0b4498 (patch)
tree54d6ac876fa73272270c65d9ab924a16a1a46115 /src
parent783fcd92d8a961b4933e630e2cbbd455b4174146 (diff)
parent662214084178a687a32823decd4f42ba82313def (diff)
downloadandroid_packages_apps_PackageInstaller-0f93d6b10a2a94178e905161d84ffb0f9e0b4498.tar.gz
android_packages_apps_PackageInstaller-0f93d6b10a2a94178e905161d84ffb0f9e0b4498.tar.bz2
android_packages_apps_PackageInstaller-0f93d6b10a2a94178e905161d84ffb0f9e0b4498.zip
Merge "Show installer UI for user to confirm side-loading" into nyc-dev
am: 6622140841 * commit '662214084178a687a32823decd4f42ba82313def': Show installer UI for user to confirm side-loading Change-Id: I017268c1d12c5fdfaea099e9428c3def1b728bdd
Diffstat (limited to 'src')
-rw-r--r--src/com/android/packageinstaller/PackageInstallerActivity.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index 3b191458..6692d66a 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -388,13 +388,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
mAppInfo = null;
}
- // 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();
- }
+ startInstallConfirm();
}
void setPmResult(int pmResult) {