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

Commit e4478c9c authored by Shobhit Goel's avatar Shobhit Goel Committed by Android (Google) Code Review
Browse files

Merge "Add logging to compat override calls" into main

parents b0c84bce 9ce1993d

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

+11 −1
Original line number Diff line number Diff line
@@ -286,6 +286,9 @@ final class CompatConfig { 
            return new CompatChange(changeId);

        });

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

        Slog.d(TAG, (overrides.isEnabled() ? "Enabled" : "Disabled")

                + " change " + changeId + (c.getName() != null ? " [" + c.getName() + "]" : "")

                + " for " + packageName);

        invalidateCache();

        return alreadyKnown.get();

    }
@@ -372,7 +375,14 @@ final class CompatConfig { 
        long changeId = change.getId();

        OverrideAllowedState allowedState =

                mOverrideValidator.getOverrideAllowedState(changeId, packageName);

        return change.removePackageOverride(packageName, allowedState, versionCode);

        boolean overrideExists = change.removePackageOverride(packageName, allowedState,

                versionCode);

        if (overrideExists) {

            Slog.d(TAG, "Reset change " + changeId

                    + (change.getName() != null ? " [" + change.getName() + "]" : "")

                    + " for " + packageName + " to default value.");

        }

        return overrideExists;

    }



    /**