Merge "Revert "Camera: Restore FastNative annotation."" into sc-dev

This commit is contained in:
Rucha Katakwar
2021-07-09 18:13:07 +00:00
committed by Android (Google) Code Review

View File

@@ -1869,40 +1869,28 @@ public class CameraMetadataNative implements Parcelable {
@FastNative @FastNative
private static native void nativeUpdate(long dst, long src); private static native void nativeUpdate(long dst, long src);
@FastNative private static synchronized native void nativeWriteToParcel(Parcel dest, long ptr);
private static native void nativeWriteToParcel(Parcel dest, 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 native void nativeReadFromParcel(Parcel source, long ptr);
@FastNative
private static native void nativeSwap(long ptr, long otherPtr)
throws NullPointerException; throws NullPointerException;
@FastNative @FastNative
private static native void nativeClose(long ptr);
@FastNative
private static native boolean nativeIsEmpty(long ptr);
@FastNative
private static native int nativeGetEntryCount(long ptr);
@FastNative
private static native long nativeGetBufferSize(long ptr);
@FastNative
private static native void nativeSetVendorId(long ptr, long vendorId); private static native void nativeSetVendorId(long ptr, long vendorId);
private static synchronized native void nativeClose(long ptr);
private static synchronized native boolean nativeIsEmpty(long ptr);
private static synchronized native int nativeGetEntryCount(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 native byte[] nativeReadValues(int tag, long ptr); private static synchronized native void nativeWriteValues(int tag, byte[] src, long ptr);
@FastNative
private static 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 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 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 native int nativeGetTypeFromTagLocal(long ptr, int tag)
throws IllegalArgumentException; throws IllegalArgumentException;
@FastNative @FastNative
private static native int nativeGetTagFromKey(String keyName, long vendorId) private static native int nativeGetTagFromKey(String keyName, long vendorId)