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

Commit 00cbceaf authored by Paul Duffin's avatar Paul Duffin Committed by Android (Google) Code Review
Browse files

Merge "Remove dependency on dalvik.annotation.compat.VersionCodes" into rvc-dev-plus-aosp

parents b904a712 1d6554d7

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -123,7 +123,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;
@@ -344,7 +343,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.





    /**

    /**
@@ -360,7 +359,7 @@ public final class ProcessList { 
     * app has made them world-readable.

     * app has made them world-readable.

     */

     */

    @ChangeId

    @ChangeId

    @EnabledAfter(targetSdkVersion = VersionCodes.Q)

    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q)

    private static final long APP_DATA_DIRECTORY_ISOLATION = 143937733; // See b/143937733

    private static final long APP_DATA_DIRECTORY_ISOLATION = 143937733; // See b/143937733





    ActivityManagerService mService = null;

    ActivityManagerService mService = null;