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

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

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

parents bf6184a0 5dadfd8a

core/java/android/os/MessageQueue.java

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

import android.util.proto.ProtoOutputStream;



import dalvik.annotation.optimization.CriticalNative;



import java.io.FileDescriptor;

import java.lang.annotation.Retention;

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

    @UnsupportedAppUsage

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

    @CriticalNative

    private native static void nativeWake(long ptr);

    private native static boolean nativeIsPolling(long ptr);

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

core/jni/android_os_MessageQueue.cpp

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

}



static void android_os_MessageQueue_nativeWake(jlong ptr) {

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

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

    nativeMessageQueue->wake();

}