Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31145f45 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Idf2c9bd8,Iec48362f 

* changes:
  Remove unnecessary art.module.api.annotations
  Remove dependency on dalvik.annotation.compat.VersionCodes
parents 7f26443f c58441f5

Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -555,9 +555,6 @@ java_library { 
    srcs: [

        "core/java/android/annotation/IntDef.java",

    ],

    static_libs: [

        "art.module.api.annotations",

    ],



    sdk_version: "core_current",

}

services/core/java/com/android/server/am/ProcessList.java

+1 −2
Original line number Diff line number Diff line
@@ -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;