DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into stage-aosp-master (2c51da6f) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/InstallStart.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -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();