From 2978f191242484f6dfe7742088748d3a0f607284 Mon Sep 17 00:00:00 2001
From: Andrei Onea <andreionea@google.com>
Date: Wed, 12 Feb 2020 17:05:05 +0000
Subject: [PATCH] Add @ChangeId for CTS test

Because CTS tests must run on user builds, the compat change for testing
android.app.compat.CompatChanges must be a legitimate one, gated on
targetSdk.

Bug: 149340016
Test: atest CtsAppCompatHostTestCases # on user build

Change-Id: I49985681f2022308419f7f7a1e4e4d4c0fe48315
---
 .../core/java/com/android/server/compat/CompatChange.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/services/core/java/com/android/server/compat/CompatChange.java b/services/core/java/com/android/server/compat/CompatChange.java
index 2eec4199217f5..8687f35d745e5 100644
--- a/services/core/java/com/android/server/compat/CompatChange.java
+++ b/services/core/java/com/android/server/compat/CompatChange.java
@@ -17,6 +17,7 @@
 package com.android.server.compat;
 
 import android.annotation.Nullable;
+import android.compat.annotation.ChangeId;
 import android.compat.annotation.EnabledAfter;
 import android.content.pm.ApplicationInfo;
 
@@ -38,6 +39,13 @@ import java.util.Map;
  */
 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.
+
     /**
      * Callback listener for when compat changes are updated for a package.
      * See {@link #registerListener(ChangeListener)} for more details.