diff options
author | Adam Seaton <aseaton@google.com> | 2019-01-11 22:55:22 +0000 |
---|---|---|
committer | Adam Seaton <aseaton@google.com> | 2019-01-11 22:55:22 +0000 |
commit | 31195c7d898f1e59f04bc395727b17af3558e4dd (patch) | |
tree | f5ee6e23b4a3e056465becb618ea2deed380742a | |
parent | 4c31ef54581a97da8f8db12476d30dc29a293696 (diff) | |
parent | c5bf56c6fe23e2a076050427671346f34b595a89 (diff) | |
download | android_packages_apps_PackageInstaller-31195c7d898f1e59f04bc395727b17af3558e4dd.tar.gz android_packages_apps_PackageInstaller-31195c7d898f1e59f04bc395727b17af3558e4dd.tar.bz2 android_packages_apps_PackageInstaller-31195c7d898f1e59f04bc395727b17af3558e4dd.zip |
January Pi-platform-release merges
Change-Id: I22ea34108a31de5b18e9b1718fb0dbbe6d4eba90
-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(); |