diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-01-14 16:59:22 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-14 16:59:22 -0800 |
commit | 0c7d90db841719d480dcc8e9befba942120489c7 (patch) | |
tree | f5ee6e23b4a3e056465becb618ea2deed380742a | |
parent | f3f61fe5f92bf34aab13a3f7fe230d154e9ad994 (diff) | |
parent | 675955185b63cb0d03363e44fd7a81f07039e20c (diff) | |
download | android_packages_apps_PackageInstaller-0c7d90db841719d480dcc8e9befba942120489c7.tar.gz android_packages_apps_PackageInstaller-0c7d90db841719d480dcc8e9befba942120489c7.tar.bz2 android_packages_apps_PackageInstaller-0c7d90db841719d480dcc8e9befba942120489c7.zip |
Snap for 5230900 from 31195c7d898f1e59f04bc395727b17af3558e4dd to pi-platform-release
am: 675955185b
Change-Id: I833a4da64a73d2f9197de3adf989c359b113dd19
-rw-r--r-- | src/com/android/packageinstaller/InstallStart.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/InstallStart.java b/src/com/android/packageinstaller/InstallStart.java index d06b6f55..42927373 100644 --- a/src/com/android/packageinstaller/InstallStart.java +++ b/src/com/android/packageinstaller/InstallStart.java @@ -58,9 +58,14 @@ public class InstallStart extends Activity { Intent intent = getIntent(); String callingPackage = getCallingPackage(); + final boolean isSessionInstall = + PackageInstaller.ACTION_CONFIRM_PERMISSIONS.equals(intent.getAction()); + // If the activity was started via a PackageInstaller session, we retrieve the calling // package from that session - int sessionId = intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID, -1); + final int sessionId = (isSessionInstall + ? intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID, -1) + : -1); if (callingPackage == null && sessionId != -1) { PackageInstaller packageInstaller = getPackageManager().getPackageInstaller(); PackageInstaller.SessionInfo sessionInfo = packageInstaller.getSessionInfo(sessionId); @@ -103,7 +108,7 @@ public class InstallStart extends Activity { nextActivity.putExtra(PackageInstallerActivity.EXTRA_ORIGINAL_SOURCE_INFO, sourceInfo); nextActivity.putExtra(Intent.EXTRA_ORIGINATING_UID, originatingUid); - if (PackageInstaller.ACTION_CONFIRM_PERMISSIONS.equals(intent.getAction())) { + if (isSessionInstall) { nextActivity.setClass(this, PackageInstallerActivity.class); } else { Uri packageUri = intent.getData(); |