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

Commit 3e1862fb authored by Hans Boehm's avatar Hans Boehm Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Mark nativeWake as CriticalNative."" into main

parents 0051e657 a618f1aa

core/java/android/os/MessageQueue.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,8 @@ import android.util.Printer; 
import android.util.SparseArray;

import android.util.SparseArray;

import android.util.proto.ProtoOutputStream;

import android.util.proto.ProtoOutputStream;





import dalvik.annotation.optimization.CriticalNative;



import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.lang.annotation.Retention;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.RetentionPolicy;
@@ -78,6 +80,7 @@ public final class MessageQueue { 
    private native static void nativeDestroy(long ptr);

    private native static void nativeDestroy(long ptr);

    @UnsupportedAppUsage

    @UnsupportedAppUsage

    private native void nativePollOnce(long ptr, int timeoutMillis); /*non-static for callbacks*/

    private native void nativePollOnce(long ptr, int timeoutMillis); /*non-static for callbacks*/

    @CriticalNative

    private native static void nativeWake(long ptr);

    private native static void nativeWake(long ptr);

    private native static boolean nativeIsPolling(long ptr);

    private native static boolean nativeIsPolling(long ptr);

    private native static void nativeSetFileDescriptorEvents(long ptr, int fd, int events);

    private native static void nativeSetFileDescriptorEvents(long ptr, int fd, int events);

core/jni/android_os_MessageQueue.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -225,7 +225,7 @@ static void android_os_MessageQueue_nativePollOnce(JNIEnv* env, jobject obj, 
    nativeMessageQueue->pollOnce(env, obj, timeoutMillis);

    nativeMessageQueue->pollOnce(env, obj, timeoutMillis);

}

}





static void android_os_MessageQueue_nativeWake(JNIEnv* env, jclass clazz, jlong ptr) {

static void android_os_MessageQueue_nativeWake(jlong ptr) {

    NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr);

    NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr);

    nativeMessageQueue->wake();

    nativeMessageQueue->wake();

}

}