From 58d18786f56e4349603b2274090d3a4d4dc71235 Mon Sep 17 00:00:00 2001 From: Andrei Onea Date: Fri, 30 Oct 2020 17:23:36 +0000 Subject: [PATCH] Migrate CTS_SYSTEM_API_CHANGEID to @EnabledSince The actual target sdk for this changeid is currently irrelevant; it does need to be larger than the target SDK of the CTS test app (to allow opting in), and invisible in dev UI. The latter was already the case, however made it explicit. Bug: 149103556 Bug: 149469819 Test: adb shell dumpsys platform_compat | grep CTS_SYSTEM_API_CHANGEID Change-Id: I64a10bb0964349eb212d26cf40e9f15ad2ba61da --- .../core/java/com/android/server/compat/CompatChange.java | 6 +++--- .../core/java/com/android/server/compat/PlatformCompat.java | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/compat/CompatChange.java b/services/core/java/com/android/server/compat/CompatChange.java index bc3bff1b966f9..ff31931825012 100644 --- a/services/core/java/com/android/server/compat/CompatChange.java +++ b/services/core/java/com/android/server/compat/CompatChange.java @@ -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. diff --git a/services/core/java/com/android/server/compat/PlatformCompat.java b/services/core/java/com/android/server/compat/PlatformCompat.java index 38664fe09044b..2c19a2d2855c8 100644 --- a/services/core/java/com/android/server/compat/PlatformCompat.java +++ b/services/core/java/com/android/server/compat/PlatformCompat.java @@ -375,6 +375,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) {