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

Commit e6db6b21 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Gerrit Code Review
Browse files

Merge "Remove FastNative annotations on synchronized methods."

parents 5ffc4b11 0874a6fb
Loading
Loading
Loading
Loading
+0 −11
Original line number Original line Diff line number Diff line
@@ -1693,35 +1693,24 @@ public class CameraMetadataNative implements Parcelable {
    private static native long nativeAllocateCopy(long ptr)
    private static native long nativeAllocateCopy(long ptr)
            throws NullPointerException;
            throws NullPointerException;


    @FastNative
    private static synchronized native void nativeWriteToParcel(Parcel dest, long ptr);
    private static synchronized native void nativeWriteToParcel(Parcel dest, long ptr);
    @FastNative
    private static synchronized native void nativeReadFromParcel(Parcel source, long ptr);
    private static synchronized native void nativeReadFromParcel(Parcel source, long ptr);
    @FastNative
    private static synchronized native void nativeSwap(long ptr, long otherPtr)
    private static synchronized native void nativeSwap(long ptr, long otherPtr)
            throws NullPointerException;
            throws NullPointerException;
    @FastNative
    private static synchronized native void nativeClose(long ptr);
    private static synchronized native void nativeClose(long ptr);
    @FastNative
    private static synchronized native boolean nativeIsEmpty(long ptr);
    private static synchronized native boolean nativeIsEmpty(long ptr);
    @FastNative
    private static synchronized native int nativeGetEntryCount(long ptr);
    private static synchronized native int nativeGetEntryCount(long ptr);


    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
    @FastNative
    private static synchronized native byte[] nativeReadValues(int tag, long ptr);
    private static synchronized native byte[] nativeReadValues(int tag, long ptr);
    @FastNative
    private static synchronized native void nativeWriteValues(int tag, byte[] src, long ptr);
    private static synchronized native void nativeWriteValues(int tag, byte[] src, long ptr);
    private static synchronized native void nativeDump(long ptr) throws IOException; // dump to LOGD
    private static synchronized native void nativeDump(long ptr) throws IOException; // dump to LOGD


    @FastNative
    private static synchronized native ArrayList nativeGetAllVendorKeys(long ptr, Class keyClass);
    private static synchronized native ArrayList nativeGetAllVendorKeys(long ptr, Class keyClass);
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
    @FastNative
    private static synchronized native int nativeGetTagFromKeyLocal(long ptr, String keyName)
    private static synchronized native int nativeGetTagFromKeyLocal(long ptr, String keyName)
            throws IllegalArgumentException;
            throws IllegalArgumentException;
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
    @FastNative
    private static synchronized native int nativeGetTypeFromTagLocal(long ptr, int tag)
    private static synchronized native int nativeGetTypeFromTagLocal(long ptr, int tag)
            throws IllegalArgumentException;
            throws IllegalArgumentException;
    @FastNative
    @FastNative