Merge "Add @ChangeId for CTS test" am: 8e08b87e82 am: 1a321133af am: 914b5ecc9f

Change-Id: Idaa31b3c471e5a747fd9b8f705c47872264a062e

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.