Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Idf2c9bd8,Iec48362f

Browse Source 
* changes:
  Remove unnecessary art.module.api.annotations
  Remove dependency on dalvik.annotation.compat.VersionCodes
This commit is contained in:
Treehugger Robot
2020-03-24 11:31:33 +00:00
committed by Gerrit Code Review
parent 7f26443fac c58441f56a
commit 31145f453b
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.bp
View File

@@ -555,9 +555,6 @@ java_library {
srcs: [ srcs: [
"core/java/android/annotation/IntDef.java", "core/java/android/annotation/IntDef.java",
], ],
static_libs: [
"art.module.api.annotations",
],
sdk_version: "core_current", sdk_version: "core_current",
} }

3
services/core/java/com/android/server/am/ProcessList.java
View File

@@ -106,7 +106,6 @@ import com.android.server.pm.dex.DexManager;
import com.android.server.wm.ActivityServiceConnectionsHolder; import com.android.server.wm.ActivityServiceConnectionsHolder;
import com.android.server.wm.WindowManagerService; import com.android.server.wm.WindowManagerService;
import dalvik.annotation.compat.VersionCodes;
import dalvik.system.VMRuntime; import dalvik.system.VMRuntime;
import java.io.File; import java.io.File;
@@ -290,7 +289,7 @@ public final class ProcessList {
* Pointers</a> * Pointers</a>
*/ */
@ChangeId @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. private static final long NATIVE_HEAP_POINTER_TAGGING = 135754954; // This is a bug id.
ActivityManagerService mService = null; ActivityManagerService mService = null;