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

Commit 58865c71 authored by tomnatan's avatar tomnatan
Browse files

Avoid locking mChanges when not necessary 

This is done to prevent a deadlock from occuring when PackageManager#getApplicationInfo is called while mChanges is locked.

Bug: 190058852
Test: atest FrameworksServicesTests:CompatConfigTest
Change-Id: I193c8f0ce2659b89469bb21e505a6da382b64703
parent da0913d1

services/core/java/com/android/server/compat/CompatConfig.java

+30 −22
Original line number Diff line number Diff line
@@ -235,14 +235,12 @@ final class CompatConfig { 
     * @param packageName app for which the overrides will be applied.

     */

    void addOverrides(CompatibilityOverrideConfig overrides, String packageName) {

        synchronized (mChanges) {

        for (Long changeId : overrides.overrides.keySet()) {

            addOverrideUnsafe(changeId, packageName, overrides.overrides.get(changeId));

        }

        saveOverrides();

        invalidateCache();

    }

    }



    private boolean addOverrideUnsafe(long changeId, String packageName,

            PackageOverride overrides) {
@@ -335,23 +333,34 @@ final class CompatConfig { 


    /**

     * Unsafe version of {@link #removeOverride(long, String)}.

     * It does not invalidate the cache nor save the overrides.

     * It does not save the overrides.

     */

    private boolean removeOverrideUnsafe(long changeId, String packageName) {

        Long versionCode = getVersionCodeOrNull(packageName);

        synchronized (mChanges) {

            CompatChange c = mChanges.get(changeId);

            if (c != null) {

                return removeOverrideUnsafe(c, packageName, versionCode);

            }

        }

        return false;

    }



    /**

     * Similar to {@link #removeOverrideUnsafe(long, String)} except this method receives a {@link

     * CompatChange} directly as well as the package's version code.

     */

    private boolean removeOverrideUnsafe(CompatChange change, String packageName,

            @Nullable Long versionCode) {

        long changeId = change.getId();

        OverrideAllowedState allowedState =

                mOverrideValidator.getOverrideAllowedState(changeId, packageName);

                if (c.hasPackageOverride(packageName)) {

        if (change.hasPackageOverride(packageName)) {

            allowedState.enforce(changeId, packageName);

                    c.removePackageOverride(packageName, allowedState, versionCode);

            change.removePackageOverride(packageName, allowedState, versionCode);

            invalidateCache();

            return true;

        }

            }

        }

        return false;

    }
@@ -364,10 +373,11 @@ final class CompatConfig { 
     * @param packageName the package for which the overrides should be purged

     */

    void removePackageOverrides(String packageName) {

        Long versionCode = getVersionCodeOrNull(packageName);

        synchronized (mChanges) {

            for (int i = 0; i < mChanges.size(); ++i) {

                CompatChange change = mChanges.valueAt(i);

                removeOverrideUnsafe(change.getId(), packageName);

                removeOverrideUnsafe(change, packageName, versionCode);

            }

            saveOverrides();

            invalidateCache();
@@ -386,14 +396,12 @@ final class CompatConfig { 
     */

    void removePackageOverrides(CompatibilityOverridesToRemoveConfig overridesToRemove,

            String packageName) {

        synchronized (mChanges) {

        for (Long changeId : overridesToRemove.changeIds) {

            removeOverrideUnsafe(changeId, packageName);

        }

        saveOverrides();

        invalidateCache();

    }

    }



    private long[] getAllowedChangesSinceTargetSdkForPackage(String packageName,

            int targetSdkVersion) {