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

Commit 5dadfd8a authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

Revert "Mark nativeWake as CriticalNative." 

This reverts commit 3f7e23e0.

Reason for revert: b/308616584

Change-Id: I76ace9bd4998d3f8ddf6825e1ae76e7d59db78ab
parent 3f7e23e0

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;
@@ -72,7 +70,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();

}