Merge "Remove FastNative annotations on synchronized methods." am: e6db6b21e6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e8f3a0b38776196c58d1d4cc818b19a7b4906c9
This commit is contained in:
Nicolas Geoffray
2020-12-14 14:20:05 +00:00
committed by Automerger Merge Worker

View File

@@ -1693,35 +1693,24 @@ public class CameraMetadataNative implements Parcelable {
private static native long nativeAllocateCopy(long ptr)
throws NullPointerException;
@FastNative
private static synchronized native void nativeWriteToParcel(Parcel dest, long ptr);
@FastNative
private static synchronized native void nativeReadFromParcel(Parcel source, long ptr);
@FastNative
private static synchronized native void nativeSwap(long ptr, long otherPtr)
throws NullPointerException;
@FastNative
private static synchronized native void nativeClose(long ptr);
@FastNative
private static synchronized native boolean nativeIsEmpty(long ptr);
@FastNative
private static synchronized native int nativeGetEntryCount(long ptr);
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@FastNative
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 nativeDump(long ptr) throws IOException; // dump to LOGD
@FastNative
private static synchronized native ArrayList nativeGetAllVendorKeys(long ptr, Class keyClass);
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@FastNative
private static synchronized native int nativeGetTagFromKeyLocal(long ptr, String keyName)
throws IllegalArgumentException;
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@FastNative
private static synchronized native int nativeGetTypeFromTagLocal(long ptr, int tag)
throws IllegalArgumentException;
@FastNative