Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ca02067 authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
Browse files

Merge "Snap for 5230900 from 31195c7d to... 

Merge "Snap for 5230900 from 31195c7d to pi-platform-release am: 67595518" into pie-gsi
parents f3f61fe5 0c7d90db

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();