diff options
4 files changed, 15 insertions, 15 deletions
diff --git a/core/java/android/app/compat/CompatChanges.java b/core/java/android/app/compat/CompatChanges.java index 24ca72c66ab4..0e3156787d5d 100644 --- a/core/java/android/app/compat/CompatChanges.java +++ b/core/java/android/app/compat/CompatChanges.java @@ -119,7 +119,7 @@ public final class CompatChanges { ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE)); CompatibilityOverrideConfig config = new CompatibilityOverrideConfig(overrides); try { - platformCompat.setOverridesOnReleaseBuilds(config, packageName); + platformCompat.putOverridesOnReleaseBuilds(config, packageName); } catch (RemoteException e) { e.rethrowFromSystemServer(); } diff --git a/core/java/com/android/internal/compat/IPlatformCompat.aidl b/core/java/com/android/internal/compat/IPlatformCompat.aidl index f718d408f217..418d16e07a75 100644 --- a/core/java/com/android/internal/compat/IPlatformCompat.aidl +++ b/core/java/com/android/internal/compat/IPlatformCompat.aidl @@ -168,7 +168,7 @@ interface IPlatformCompat { * @param packageName the package name of the app whose changes will be overridden * @throws SecurityException if overriding changes is not permitted */ - void setOverridesOnReleaseBuilds(in CompatibilityOverrideConfig overrides, in String packageName); + void putOverridesOnReleaseBuilds(in CompatibilityOverrideConfig overrides, in String packageName); /** * Adds overrides to compatibility changes. diff --git a/services/core/java/com/android/server/app/GameManagerService.java b/services/core/java/com/android/server/app/GameManagerService.java index 96db1adcfddb..75367d27a8a1 100644 --- a/services/core/java/com/android/server/app/GameManagerService.java +++ b/services/core/java/com/android/server/app/GameManagerService.java @@ -647,9 +647,9 @@ public final class GameManagerService extends IGameManagerService.Stub { final CompatibilityOverrideConfig changeConfig = new CompatibilityOverrideConfig( overrides); try { - mPlatformCompat.setOverridesOnReleaseBuilds(changeConfig, packageName); + mPlatformCompat.putOverridesOnReleaseBuilds(changeConfig, packageName); } catch (RemoteException e) { - Slog.e(TAG, "Failed to call IPlatformCompat#setOverridesOnReleaseBuilds", e); + Slog.e(TAG, "Failed to call IPlatformCompat#putOverridesOnReleaseBuilds", e); } } finally { Binder.restoreCallingIdentity(uid); @@ -671,9 +671,9 @@ public final class GameManagerService extends IGameManagerService.Stub { final CompatibilityOverrideConfig changeConfig = new CompatibilityOverrideConfig( overrides); try { - mPlatformCompat.setOverridesOnReleaseBuilds(changeConfig, packageName); + mPlatformCompat.putOverridesOnReleaseBuilds(changeConfig, packageName); } catch (RemoteException e) { - Slog.e(TAG, "Failed to call IPlatformCompat#setOverridesOnReleaseBuilds", e); + Slog.e(TAG, "Failed to call IPlatformCompat#putOverridesOnReleaseBuilds", e); } } finally { Binder.restoreCallingIdentity(uid); diff --git a/services/core/java/com/android/server/compat/PlatformCompat.java b/services/core/java/com/android/server/compat/PlatformCompat.java index eba53fb05985..2cd68b086453 100644 --- a/services/core/java/com/android/server/compat/PlatformCompat.java +++ b/services/core/java/com/android/server/compat/PlatformCompat.java @@ -207,15 +207,6 @@ public class PlatformCompat extends IPlatformCompat.Stub { } @Override - public void setOverridesOnReleaseBuilds(CompatibilityOverrideConfig overrides, - String packageName) { - // TODO(b/183630314): Unify the permission enforcement with the other setOverrides* methods. - checkCompatChangeOverrideOverridablePermission(); - checkAllCompatOverridesAreOverridable(overrides.overrides.keySet()); - mCompatConfig.addOverrides(overrides, packageName); - } - - @Override public void setOverridesForTest(CompatibilityChangeConfig overrides, String packageName) { checkCompatChangeOverridePermission(); Map<Long, PackageOverride> overridesMap = new HashMap<>(); @@ -230,6 +221,15 @@ 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.addOverrides(overrides, packageName); + } + + @Override public int enableTargetSdkChanges(String packageName, int targetSdkVersion) { checkCompatChangeOverridePermission(); int numChanges = |