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

Commit d31f8b15 authored by Tom Natan's avatar Tom Natan Committed by Android (Google) Code Review
Browse files

Merge "Remove TODO for b/183630314 since it was marked as obsolete"

parents 02853cf1 3fa1e653

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

+0 −4
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ public class PlatformCompat extends IPlatformCompat.Stub { 
    @Override

    public void putAllOverridesOnReleaseBuilds(

            CompatibilityOverridesByPackageConfig overridesByPackage) {

        // TODO(b/183630314): Unify the permission enforcement with the other setOverrides* methods.

        checkCompatChangeOverrideOverridablePermission();

        for (CompatibilityOverrideConfig overrides :

                overridesByPackage.packageNameToOverrides.values()) {
@@ -242,7 +241,6 @@ public class PlatformCompat extends IPlatformCompat.Stub { 
    @Override

    public void putOverridesOnReleaseBuilds(CompatibilityOverrideConfig overrides,

            String packageName) {

        // TODO(b/183630314): Unify the permission enforcement with the other setOverrides* methods.

        checkCompatChangeOverrideOverridablePermission();

        checkAllCompatOverridesAreOverridable(overrides.overrides.keySet());

        mCompatConfig.addPackageOverrides(overrides, packageName, /* skipUnknownChangeIds= */ true);
@@ -296,7 +294,6 @@ public class PlatformCompat extends IPlatformCompat.Stub { 
    @Override

    public void removeAllOverridesOnReleaseBuilds(

            CompatibilityOverridesToRemoveByPackageConfig overridesToRemoveByPackage) {

        // TODO(b/183630314): Unify the permission enforcement with the other setOverrides* methods.

        checkCompatChangeOverrideOverridablePermission();

        for (CompatibilityOverridesToRemoveConfig overridesToRemove :

                overridesToRemoveByPackage.packageNameToOverridesToRemove.values()) {
@@ -309,7 +306,6 @@ public class PlatformCompat extends IPlatformCompat.Stub { 
    public void removeOverridesOnReleaseBuilds(

            CompatibilityOverridesToRemoveConfig overridesToRemove,

            String packageName) {

        // TODO(b/183630314): Unify the permission enforcement with the other setOverrides* methods.

        checkCompatChangeOverrideOverridablePermission();

        checkAllCompatOverridesAreOverridable(overridesToRemove.changeIds);

        mCompatConfig.removePackageOverrides(overridesToRemove, packageName);