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

Commit e352e54b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Ravenwood] Restructure redirection classes" into main

parents 8bf6f7d8 c850e852
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ import java.util.regex.Pattern;
 * event-log-tags file defines the payload contents for each type code.
 */
@RavenwoodKeepWholeClass
@RavenwoodRedirectionClass("EventLog_host")
@RavenwoodRedirectionClass("EventLog_ravenwood")
public class EventLog {
    /** @hide */ public EventLog() {}

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ import com.android.internal.os.RuntimeInit;

import java.io.PrintStream;

public class EventLog_host {
public class EventLog_ravenwood {
    public static int writeEvent(int tag, int value) {
        return writeEvent(tag, (Object) value);
    }
+3 −4
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@
package android.util;

import android.annotation.Nullable;
import android.os.Process;
import android.util.Log.Level;

import com.android.internal.annotations.GuardedBy;
import com.android.internal.os.RuntimeInit;
import com.android.ravenwood.RavenwoodRuntimeNative;

import java.io.PrintStream;
import java.text.SimpleDateFormat;
@@ -180,14 +180,13 @@ public class Log_ravenwood {
     */
    private static volatile int sPid = 0;

    private static ThreadLocal<Integer> sTid =
            ThreadLocal.withInitial(RavenwoodRuntimeNative::gettid);
    private static ThreadLocal<Integer> sTid = ThreadLocal.withInitial(Process::myTid);

    /**
     * Call it when {@link RavenwoodRuntimeNative} is usable.
     */
    public static void onRavenwoodRuntimeNativeReady() {
        sPid = RavenwoodRuntimeNative.getpid();
        sPid = Process.myPid();
    }

    private static int getPid() {
+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import android.ravenwood.annotation.RavenwoodReplace;
 * is mostly redundant. Clean it up.
 */
@RavenwoodKeepWholeClass
@RavenwoodRedirectionClass("RavenwoodEnvironment_host")
@RavenwoodRedirectionClass("RavenwoodEnvironment_ravenwood")
public final class RavenwoodEnvironment {
    public static final String TAG = "RavenwoodEnvironment";

Loading