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

Merge "Migrate CTS_SYSTEM_API_CHANGEID to @EnabledSince" am: 9aed0ced55 am: 1e91aa6b78 am: daad5e0aa3 am: 9a8dde9618

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

Change-Id: Ia3988eca36156082daef38b79093e1ff1dcc6f0b
This commit is contained in:
Andrei-Valentin Onea
2020-11-02 19:04:04 +00:00
committed by Automerger Merge Worker
parent 66b1bf4690 9a8dde9618
commit 542292a900
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ package com.android.server.compat;
import android.annotation.Nullable;
import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledAfter;
import android.compat.annotation.EnabledSince;
import android.content.pm.ApplicationInfo;
import com.android.internal.compat.CompatibilityChangeInfo;
@@ -43,8 +43,8 @@ public final class CompatChange extends CompatibilityChangeInfo {
* A change ID to be used only in the CTS test for this SystemApi
*/
@ChangeId
@EnabledAfter(targetSdkVersion = 1234) // Needs to be > test APK targetSdkVersion.
private static final long CTS_SYSTEM_API_CHANGEID = 149391281; // This is a bug id.
@EnabledSince(targetSdkVersion = 1235) // Needs to be > test APK targetSdkVersion.
static final long CTS_SYSTEM_API_CHANGEID = 149391281; // This is a bug id.
/**
* Callback listener for when compat changes are updated for a package.

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

@@ -381,6 +381,9 @@ public class PlatformCompat extends IPlatformCompat.Stub {
if (change.getLoggingOnly()) {
return false;
}
if (change.getId() == CompatChange.CTS_SYSTEM_API_CHANGEID) {
return false;
}
if (change.getEnableSinceTargetSdk() > 0) {
if (change.getEnableSinceTargetSdk() < sMinTargetSdk
|| change.getEnableSinceTargetSdk() > sMaxTargetSdk) {