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

Commit 9832d16a authored by TYM Tsai's avatar TYM Tsai
Browse files

Double counting native libs in calculating install size 

Calculation of install size does not account for extractNativeLibs
is false.
When native libs are not extracted, we shouldn't add
sumNativeBinariesWithOverride to the size as native libs size is
accounted for in APK size.

Bug: 298164353
Test: atest CtsPackageInstallTestCases
Test: atest CtsPackageUninstallTestCases
Test: atest PackageInstallerTests
Test: atest CtsPackageInstallerTapjackingTestCases
Change-Id: Idff46f6253073edf72f62e2b0499022e6c7bf55f
parent ab6e6765

core/java/com/android/internal/content/InstallLocationUtils.java

+4 −2
Original line number Diff line number Diff line
@@ -454,8 +454,10 @@ public class InstallLocationUtils { 
        // Include raw dex metadata files

        sizeBytes += DexMetadataHelper.getPackageDexMetadataSize(pkg);



        if (pkg.isExtractNativeLibs()) {

            // Include all relevant native code

            sizeBytes += NativeLibraryHelper.sumNativeBinariesWithOverride(handle, abiOverride);

        }



        return sizeBytes;

    }