Remove FastNative annotations on synchronized methods.

FastNative doesn't work on synchronized methods.

Bug: 175016705
Test: 004-JniTest
Change-Id: I1e34c78a8438c67e5a1bedb83eb977389ee9a82d
This commit is contained in:
Nicolas Geoffray
2020-12-08 08:59:40 +00:00
parent 96e342601e
commit 7c4c101a7b

View File

@@ -1719,37 +1719,25 @@ 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);
@FastNative
private static synchronized native long nativeGetBufferSize(long ptr); private static synchronized native long nativeGetBufferSize(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