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

Merge "Allow clearing a single change id for tests usage." am: 2805c99594

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a9c218bac4775f5b59c0b8d2c8154f38b0ff4b9
This commit is contained in:
satayev
2021-01-20 18:11:39 +00:00
committed by Automerger Merge Worker
parent 5e27a324ac 2805c99594
commit 3bbe9c336f
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,6 +172,17 @@ interface IPlatformCompat {
*/ */
boolean clearOverride(long changeId, String packageName); boolean clearOverride(long changeId, String packageName);
/**
* Restores the default behaviour for the given change and app.
*
* <p>Does not kill the app; to be only used in tests.
*
* @param changeId the ID of the change that was overridden
* @param packageName the app package name that was overridden
* @throws SecurityException if overriding changes is not permitted
*/
void clearOverrideForTest(long changeId, String packageName);
/** /**
* Enables all compatibility changes that have enabledSinceTargetSdk == * Enables all compatibility changes that have enabledSinceTargetSdk ==
* {@param targetSdkVersion} for an app, subject to the policy. * {@param targetSdkVersion} for an app, subject to the policy.

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

@@ -210,6 +210,12 @@ public class PlatformCompat extends IPlatformCompat.Stub {
return existed; return existed;
} }
@Override
public void clearOverrideForTest(long changeId, String packageName) {
checkCompatChangeOverridePermission();
mCompatConfig.removeOverride(changeId, packageName);
}
@Override @Override
public CompatibilityChangeConfig getAppConfig(ApplicationInfo appInfo) { public CompatibilityChangeConfig getAppConfig(ApplicationInfo appInfo) {
checkCompatChangeReadAndLogPermission(); checkCompatChangeReadAndLogPermission();