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

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

Merge "[pm] fix dynamic library after update and restart" into main

parents f87b353f 42de44bf

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

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

    }



    @Nullable

    public PackageSetting getScanRequestDisabledPackageSetting() {

        assertScanResultExists();

        return mScanResult.mRequest.mDisabledPkgSetting;

    }



    @Nullable

    public String getRealPackageName() {

        assertScanResultExists();

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

+2 −2
Original line number Diff line number Diff line
@@ -856,9 +856,9 @@ public final class SharedLibrariesImpl implements SharedLibrariesRead, Watchable 
        // We may not yet have disabled the updated package yet, so be sure to grab the

        // current setting if that's the case.

        final PackageSetting updatedSystemPs = isUpdatedSystemApp

                ? installRequest.getDisabledPackageSetting() == null

                ? installRequest.getScanRequestDisabledPackageSetting() == null

                ? installRequest.getScanRequestOldPackageSetting()

                : installRequest.getDisabledPackageSetting()

                : installRequest.getScanRequestDisabledPackageSetting()

                : null;

        if (isUpdatedSystemApp && (updatedSystemPs.getPkg() == null

                || updatedSystemPs.getPkg().getLibraryNames() == null)) {