Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename PlatformCompat#setOverridesOnReleaseBuilds to putOverridesOnReleaseBuilds." into sc-dev am: 5977f60c19

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

Change-Id: I01263c401fd743cd13d54a1b946dc36ad0833dce
This commit is contained in:
Tom Natan
2021-06-08 18:35:34 +00:00
committed by Automerger Merge Worker
parent e89022ba88 5977f60c19
commit 68fe52d5de
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/compat/CompatChanges.java
View File

@@ -119,7 +119,7 @@ public final class CompatChanges {
ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE)); ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE));
CompatibilityOverrideConfig config = new CompatibilityOverrideConfig(overrides); CompatibilityOverrideConfig config = new CompatibilityOverrideConfig(overrides);
try { try {
platformCompat.setOverridesOnReleaseBuilds(config, packageName); platformCompat.putOverridesOnReleaseBuilds(config, packageName);
} catch (RemoteException e) { } catch (RemoteException e) {
e.rethrowFromSystemServer(); e.rethrowFromSystemServer();
} }

2
core/java/com/android/internal/compat/IPlatformCompat.aidl
View File

@@ -168,7 +168,7 @@ interface IPlatformCompat {
* @param packageName the package name of the app whose changes will be overridden * @param packageName the package name of the app whose changes will be overridden
* @throws SecurityException if overriding changes is not permitted * @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. * Adds overrides to compatibility changes.

8
services/core/java/com/android/server/app/GameManagerService.java
View File

@@ -647,9 +647,9 @@ public final class GameManagerService extends IGameManagerService.Stub {
final CompatibilityOverrideConfig changeConfig = new CompatibilityOverrideConfig( final CompatibilityOverrideConfig changeConfig = new CompatibilityOverrideConfig(
overrides); overrides);
try { try {
mPlatformCompat.setOverridesOnReleaseBuilds(changeConfig, packageName); mPlatformCompat.putOverridesOnReleaseBuilds(changeConfig, packageName);
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.e(TAG, "Failed to call IPlatformCompat#setOverridesOnReleaseBuilds", e); Slog.e(TAG, "Failed to call IPlatformCompat#putOverridesOnReleaseBuilds", e);
} }
} finally { } finally {
Binder.restoreCallingIdentity(uid); Binder.restoreCallingIdentity(uid);
@@ -671,9 +671,9 @@ public final class GameManagerService extends IGameManagerService.Stub {
final CompatibilityOverrideConfig changeConfig = new CompatibilityOverrideConfig( final CompatibilityOverrideConfig changeConfig = new CompatibilityOverrideConfig(
overrides); overrides);
try { try {
mPlatformCompat.setOverridesOnReleaseBuilds(changeConfig, packageName); mPlatformCompat.putOverridesOnReleaseBuilds(changeConfig, packageName);
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.e(TAG, "Failed to call IPlatformCompat#setOverridesOnReleaseBuilds", e); Slog.e(TAG, "Failed to call IPlatformCompat#putOverridesOnReleaseBuilds", e);
} }
} finally { } finally {
Binder.restoreCallingIdentity(uid); Binder.restoreCallingIdentity(uid);

18
services/core/java/com/android/server/compat/PlatformCompat.java
View File

@@ -206,15 +206,6 @@ public class PlatformCompat extends IPlatformCompat.Stub {
killPackage(packageName); killPackage(packageName);
} }
@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 @Override
public void setOverridesForTest(CompatibilityChangeConfig overrides, String packageName) { public void setOverridesForTest(CompatibilityChangeConfig overrides, String packageName) {
checkCompatChangeOverridePermission(); checkCompatChangeOverridePermission();
@@ -229,6 +220,15 @@ public class PlatformCompat extends IPlatformCompat.Stub {
mCompatConfig.addOverrides(new CompatibilityOverrideConfig(overridesMap), packageName); mCompatConfig.addOverrides(new CompatibilityOverrideConfig(overridesMap), packageName);
} }
@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 @Override
public int enableTargetSdkChanges(String packageName, int targetSdkVersion) { public int enableTargetSdkChanges(String packageName, int targetSdkVersion) {
checkCompatChangeOverridePermission(); checkCompatChangeOverridePermission();