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

Commit 0f53ddc2 authored by Andrei-Valentin Onea's avatar Andrei-Valentin Onea Committed by Automerger Merge Worker
Browse files

Merge "Fix deadlock on CompatConfig.mChanges" am: eaf3fd59

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605516

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3b58c1aa33e9ff8692370e701d258b391eb563e
parents e70dab76 eaf3fd59
Loading
Loading
Loading
Loading
+15 −8
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -595,10 +596,17 @@ final class CompatConfig {
     * Rechecks all the existing overrides for a package.
     */
    void recheckOverrides(String packageName) {
        // Local cache of compat changes. Holding a lock on mChanges for the whole duration of the
        // method will cause a deadlock.
        List<CompatChange> changes;
        synchronized (mChanges) {
            boolean shouldInvalidateCache = false;
            changes = new ArrayList<>(mChanges.size());
            for (int idx = 0; idx < mChanges.size(); ++idx) {
                CompatChange c = mChanges.valueAt(idx);
                changes.add(mChanges.valueAt(idx));
            }
        }
        boolean shouldInvalidateCache = false;
        for (CompatChange c: changes) {
            OverrideAllowedState allowedState =
                    mOverrideValidator.getOverrideAllowedState(c.getId(), packageName);
            shouldInvalidateCache |= c.recheckOverride(packageName, allowedState, mContext);
@@ -607,7 +615,6 @@ final class CompatConfig {
            invalidateCache();
        }
    }
    }

    void registerContentObserver() {
        mOverrideValidator.registerContentObserver();