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

Commit 7faa0e66 authored by Jiakai Zhang's avatar Jiakai Zhang
Browse files

Remove `mChangedAbiCodePath` from `ScanResult`. 

It has been unused since ART Service was introduced.

Bug: 258223472
Bug: 6527146
Test: Presubmit
Flag: EXEMPT cleanup
Change-Id: Ia64b81a452de165497a66ddd1bd691cedb6a560b
parent de558b91

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

+0 −6
Original line number Diff line number Diff line
@@ -594,12 +594,6 @@ final class InstallRequest { 
        return mScanResult.mRequest.mRealPkgName;

    }



    @Nullable

    public List<String> getChangedAbiCodePath() {

        assertScanResultExists();

        return mScanResult.mChangedAbiCodePath;

    }



    public boolean isApplicationEnabledSettingPersistent() {

        return mInstallArgs == null ? false : mInstallArgs.mApplicationEnabledSettingPersistent;

    }

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

+3 −18
Original line number Diff line number Diff line
@@ -141,8 +141,6 @@ final class ScanPackageUtils { 
        final UserHandle user = request.mUser;

        final boolean isPlatformPackage = request.mIsPlatformPackage;



        List<String> changedAbiCodePath = null;



        if (DEBUG_PACKAGE_SCANNING) {

            if ((parseFlags & ParsingPackageUtils.PARSE_CHATTY) != 0) {

                Log.d(TAG, "Scanning package " + parsedPackage.getPackageName());
@@ -471,18 +469,6 @@ final class ScanPackageUtils { 
            }

        }



        if ((scanFlags & SCAN_BOOTING) == 0 && oldSharedUserSetting != null) {

            // We don't do this here during boot because we can do it all

            // at once after scanning all existing packages.

            //

            // We also do this *before* we perform dexopt on this package, so that

            // we can avoid redundant dexopts, and also to make sure we've got the

            // code and package path correct.

            changedAbiCodePath = applyAdjustedAbiToSharedUser(oldSharedUserSetting,

                    parsedPackage, packageAbiHelper.getAdjustedAbiForSharedUser(

                            oldSharedUserSetting.getPackageStates(), parsedPackage));

        }



        parsedPackage.setFactoryTest(isUnderFactoryTest && parsedPackage.getRequestedPermissions()

                .contains(android.Manifest.permission.FACTORY_TEST));
@@ -554,10 +540,9 @@ final class ScanPackageUtils { 
            }

        }



        return new ScanResult(request, pkgSetting, changedAbiCodePath,

                !createNewPackage /* existingSettingCopied */,

                Process.INVALID_UID /* previousAppId */ , sdkLibraryInfo,

                staticSharedLibraryInfo, dynamicSharedLibraryInfos);

        return new ScanResult(request, pkgSetting, !createNewPackage /* existingSettingCopied */,

                Process.INVALID_UID /* previousAppId */ , sdkLibraryInfo, staticSharedLibraryInfo,

                dynamicSharedLibraryInfos);

    }



    /**

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

+1 −7
Original line number Diff line number Diff line
@@ -48,11 +48,6 @@ final class ScanResult { 
    @Nullable

    public final PackageSetting mPkgSetting;



    // TODO(b/260124949): Check if this can be dropped when the legacy PackageManager dexopt code is

    // cleaned up.

    /** ABI code paths that have changed in the package scan */

    @Nullable public final List<String> mChangedAbiCodePath;



    public final SharedLibraryInfo mSdkSharedLibraryInfo;



    public final SharedLibraryInfo mStaticSharedLibraryInfo;
@@ -62,14 +57,13 @@ final class ScanResult { 
    ScanResult(

            @NonNull ScanRequest request,

            @Nullable PackageSetting pkgSetting,

            @Nullable List<String> changedAbiCodePath, boolean existingSettingCopied,

            boolean existingSettingCopied,

            int previousAppId,

            SharedLibraryInfo sdkSharedLibraryInfo,

            SharedLibraryInfo staticSharedLibraryInfo,

            List<SharedLibraryInfo> dynamicSharedLibraryInfos) {

        mRequest = request;

        mPkgSetting = pkgSetting;

        mChangedAbiCodePath = changedAbiCodePath;

        mExistingSettingCopied = existingSettingCopied;

        // Hardcode mPreviousAppId to INVALID_UID (http://b/221088088)

        // This will disable all migration code paths in PMS and PermMS

services/tests/mockingservicestests/src/com/android/server/pm/SharedLibrariesImplTest.kt

+4 −5
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ class SharedLibrariesImplTest { 
        val parsedPackage = pair.second as ParsedPackage

        val scanRequest = ScanRequest(parsedPackage, null, null, null, null,

            null, null, null, 0, 0, false, null, null)

        val scanResult = ScanResult(scanRequest, null, null, false, 0, null, null, null)

        val scanResult = ScanResult(scanRequest, null, false, 0, null, null, null)

        var installRequest = InstallRequest(parsedPackage, 0, 0, UserHandle(0), scanResult, null)



        val latestInfoSetting =
@@ -313,8 +313,7 @@ class SharedLibrariesImplTest { 
    @Test

    fun getAllowedSharedLibInfos_withStaticSharedLibInfo() {

        val testInfo = libOfStatic(TEST_LIB_PACKAGE_NAME, TEST_LIB_NAME, 1L)

        val scanResult = ScanResult(mock(), null, null,

            false, 0, null, testInfo, null)

        val scanResult = ScanResult(mock(), null, false, 0, null, testInfo, null)

        var installRequest = InstallRequest(mock(), 0, 0, UserHandle(0), scanResult, null)



        val allowedInfos = mSharedLibrariesImpl.getAllowedSharedLibInfos(installRequest)
@@ -336,8 +335,8 @@ class SharedLibrariesImplTest { 
            .setPkgFlags(ApplicationInfo.FLAG_SYSTEM).build()

        val scanRequest = ScanRequest(parsedPackage, null, null, null, null,

            null, null, null, 0, 0, false, null, null)

        val scanResult = ScanResult(scanRequest, packageSetting, null,

            false, 0, null, null, listOf(testInfo))

        val scanResult = ScanResult(scanRequest, packageSetting, false, 0, null, null,

            listOf(testInfo))

        var installRequest = InstallRequest(parsedPackage, 0, 0, UserHandle(0), scanResult, null)



        val allowedInfos = mSharedLibrariesImpl.getAllowedSharedLibInfos(installRequest)