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

Commit eab36663 authored by Jackal Guo's avatar Jackal Guo Committed by Android (Google) Code Review
Browse files

Merge "Validate EXTRA_INSTALLER_PACKAGE_NAME"

parents 0736dfb9 3aa2123a

packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java

+20 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.content.Intent; 
import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageInstaller;

import android.content.pm.PackageInstaller.SessionParams;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.ProviderInfo;
@@ -35,6 +36,8 @@ import android.net.Uri; 
import android.os.Build;

import android.os.Bundle;

import android.os.RemoteException;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.Log;



import java.util.Arrays;
@@ -96,6 +99,23 @@ public class InstallStart extends Activity { 
                mAbortInstall = true;

            }

        }



        final String installerPackageNameFromIntent = getIntent().getStringExtra(

                Intent.EXTRA_INSTALLER_PACKAGE_NAME);

        if (installerPackageNameFromIntent != null) {

            final String callingPkgName = getLaunchedFromPackage();

            if (installerPackageNameFromIntent.length() >= SessionParams.MAX_PACKAGE_NAME_LENGTH

                    || (!TextUtils.equals(installerPackageNameFromIntent, callingPkgName)

                    && mPackageManager.checkPermission(Manifest.permission.INSTALL_PACKAGES,

                    callingPkgName) != PackageManager.PERMISSION_GRANTED)) {

                Log.e(LOG_TAG, "The given installer package name " + installerPackageNameFromIntent

                        + " is invalid. Remove it.");

                EventLog.writeEvent(0x534e4554, "236687884", getLaunchedFromUid(),

                        "Invalid EXTRA_INSTALLER_PACKAGE_NAME");

                getIntent().removeExtra(Intent.EXTRA_INSTALLER_PACKAGE_NAME);

            }

        }



        if (mAbortInstall) {

            setResult(RESULT_CANCELED);

            finish();