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

Commit c5bf56c6 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [5532243, 5532244, 5532245, 5532246, 5532247, 5532826,... 

Merge cherrypicks of [5532243, 5532244, 5532245, 5532246, 5532247, 5532826, 5530552, 5532902, 5530553, 5531520, 5532903, 5530554, 5529581, 5529582, 5531521, 5532979, 5532999, 5532248, 5531522, 5531523, 5531524, 5531525, 5531526, 5529583, 5529584, 5529585, 5529586, 5531351, 5529632, 5530506, 5530507, 5532980, 5533000] into pi-qpr1-release

Change-Id: If30559631e1e8d4fe2017bc98d538ad4d4109883
parents 419c6b32 ab39f6cb

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