From 8fca45318dd461015ff390a157c5e691ba8f3093 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Mon, 23 Mar 2020 19:41:24 +0000
Subject: [PATCH] Remove dependency on dalvik.annotation.compat.VersionCodes

Allows removal of dependency on art.module.api.annotations.

(cherry picked from 5dc3088cc1e311fae2e28a48d2fd060919d3f0e7)

Test: m droid
Merged-In: Ib0632a3eccfed73d66a51afc0ad6aa50c0311501
Change-Id: Iec48362f2eb643b80f900b974393e23b692e7d1c
---
 services/core/java/com/android/server/am/ProcessList.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index d935162a629ba..f5cefb3ff1eae 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -106,7 +106,6 @@ import com.android.server.pm.dex.DexManager;
 import com.android.server.wm.ActivityServiceConnectionsHolder;
 import com.android.server.wm.WindowManagerService;
 
-import dalvik.annotation.compat.VersionCodes;
 import dalvik.system.VMRuntime;
 
 import java.io.File;
@@ -290,7 +289,7 @@ public final class ProcessList {
      * Pointers</a>
      */
     @ChangeId
-    @EnabledAfter(targetSdkVersion = VersionCodes.Q)
+    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q)
     private static final long NATIVE_HEAP_POINTER_TAGGING = 135754954; // This is a bug id.
 
     ActivityManagerService mService = null;