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

Commit 807f59eb authored by JW Wang's avatar JW Wang
Browse files

Protect accesses to mPackageName (7/n) 

Bug: 159663586
Test: atest StagedInstallTest AtomicInstallTest
Change-Id: I8a2f1b0cfe7b2f4b9ff0356ab598801603d22830
parent 7f344ac5

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

+7 −6
Original line number Diff line number Diff line
@@ -1586,12 +1586,12 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
    }



    private void onStorageUnhealthy() {

        if (TextUtils.isEmpty(mPackageName)) {

        final String packageName = getPackageName();

        if (TextUtils.isEmpty(packageName)) {

            // The package has not been installed.

            return;

        }

        final PackageManagerService packageManagerService = mPm;

        final String packageName = mPackageName;

        mHandler.post(() -> {

            if (packageManagerService.deletePackageX(packageName,

                    PackageManager.VERSION_CODE_HIGHEST, UserHandle.USER_SYSTEM,
@@ -1906,19 +1906,20 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        // Skip logging the side-loaded app installations, as those are private and aren't reported

        // anywhere; app stores already have a record of the installation and that's why reporting

        // it here is fine

        final String packageName = getPackageName();

        final String packageNameToLog =

                (params.installFlags & PackageManager.INSTALL_FROM_ADB) == 0 ? mPackageName : "";

                (params.installFlags & PackageManager.INSTALL_FROM_ADB) == 0 ? packageName : "";

        final long currentTimestamp = System.currentTimeMillis();

        FrameworkStatsLog.write(FrameworkStatsLog.PACKAGE_INSTALLER_V2_REPORTED,

                isIncrementalInstallation(),

                packageNameToLog,

                currentTimestamp - createdMillis,

                returnCode,

                getApksSize());

                getApksSize(packageName));

    }



    private long getApksSize() {

        final PackageSetting ps = mPm.getPackageSetting(mPackageName);

    private long getApksSize(String packageName) {

        final PackageSetting ps = mPm.getPackageSetting(packageName);

        if (ps == null) {

            return 0;

        }