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

Commit e6ce51f3 authored by Song Chun Fan's avatar Song Chun Fan Committed by Android (Google) Code Review
Browse files

Merge "[pm] fix potential NPE in system server" into udc-dev

parents f89c4b42 169fbe9e

services/core/java/com/android/server/pm/InstallPackageHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -2145,7 +2145,7 @@ final class InstallPackageHelper { 
        final String pkgName = pkg.getPackageName();

        final int[] installedForUsers = installRequest.getOriginUsers();

        final int installReason = installRequest.getInstallReason();

        final String installerPackageName = installRequest.getSourceInstallerPackageName();

        final String installerPackageName = installRequest.getInstallerPackageName();



        if (DEBUG_INSTALL) Slog.d(TAG, "New package installed in " + pkg.getPath());

        synchronized (mPm.mLock) {

services/core/java/com/android/server/pm/InstallRequest.java

+0 −6
Original line number Diff line number Diff line
@@ -366,12 +366,6 @@ final class InstallRequest { 
    public String getApexModuleName() {

        return mApexModuleName;

    }



    @Nullable

    public String getSourceInstallerPackageName() {

        return mInstallArgs.mInstallSource.mInstallerPackageName;

    }



    public boolean isRollback() {

        return mInstallArgs != null

                && mInstallArgs.mInstallReason == PackageManager.INSTALL_REASON_ROLLBACK;