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

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

Merge "Attempt to fix deadlock on saveOverrides" into sc-dev am: 782ede8c am: 6e5f35e3 

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

Change-Id: Icc54c2ab48a9c98f5807d8aee3b7886a60540f7d
parents 42c8b296 6e5f35e3

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

+14 −12
Original line number Diff line number Diff line
@@ -257,8 +257,8 @@ final class CompatConfig { 
                addChange(c);

            }

            c.addPackageOverride(packageName, overrides, allowedState, versionCode);

            invalidateCache();

        }

        invalidateCache();

        return alreadyKnown;

    }
@@ -379,10 +379,10 @@ final class CompatConfig { 
                CompatChange change = mChanges.valueAt(i);

                removeOverrideUnsafe(change, packageName, versionCode);

            }

        }

        saveOverrides();

        invalidateCache();

    }

    }



    /**

     * Removes overrides whose change ID is specified in {@code overridesToRemove} that were
@@ -626,7 +626,18 @@ final class CompatConfig { 
        if (mOverridesFile == null) {

            return;

        }

        Overrides overrides = new Overrides();

        synchronized (mChanges) {

            List<ChangeOverrides> changeOverridesList = overrides.getChangeOverrides();

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

                CompatChange c = mChanges.valueAt(idx);

                ChangeOverrides changeOverrides = c.saveOverrides();

                if (changeOverrides != null) {

                    changeOverridesList.add(changeOverrides);

                }

            }

        }

        synchronized (mOverridesFile) {

            // Create the file if it doesn't already exist

            try {

                mOverridesFile.createNewFile();
@@ -636,15 +647,6 @@ final class CompatConfig { 
            }

            try (PrintWriter out = new PrintWriter(mOverridesFile)) {

                XmlWriter writer = new XmlWriter(out);

                Overrides overrides = new Overrides();

                List<ChangeOverrides> changeOverridesList = overrides.getChangeOverrides();

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

                    CompatChange c = mChanges.valueAt(idx);

                    ChangeOverrides changeOverrides = c.saveOverrides();

                    if (changeOverrides != null) {

                        changeOverridesList.add(changeOverrides);

                    }

                }

                XmlWriter.write(writer, overrides);

            } catch (IOException e) {

                Slog.e(TAG, e.toString());