diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/camera2/impl/CameraMetadataNative.java | 5 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/marshal/impl/MarshalQueryableString.java | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java index 0e450d76ea62..4d92ab1ccbb9 100644 --- a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java +++ b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java @@ -1097,7 +1097,6 @@ public class CameraMetadataNative implements Parcelable { throws IllegalArgumentException; private static native int nativeGetTypeFromTag(int tag) throws IllegalArgumentException; - private static native void nativeClassInit(); /** * <p>Perform a 0-copy swap of the internal metadata with another object.</p> @@ -1289,10 +1288,6 @@ public class CameraMetadataNative implements Parcelable { } static { - /* - * We use a class initializer to allow the native code to cache some field offsets - */ - nativeClassInit(); registerAllMarshalers(); } } diff --git a/core/java/android/hardware/camera2/marshal/impl/MarshalQueryableString.java b/core/java/android/hardware/camera2/marshal/impl/MarshalQueryableString.java index d2c390864d09..c81e18d8ce6c 100644 --- a/core/java/android/hardware/camera2/marshal/impl/MarshalQueryableString.java +++ b/core/java/android/hardware/camera2/marshal/impl/MarshalQueryableString.java @@ -33,7 +33,9 @@ public class MarshalQueryableString implements MarshalQueryable<String> { private static final String TAG = MarshalQueryableString.class.getSimpleName(); private static final boolean DEBUG = false; - private static final Charset UTF8_CHARSET = Charset.forName("UTF-8"); + private static class PreloadHolder { + public static final Charset UTF8_CHARSET = Charset.forName("UTF-8"); + } private static final byte NUL = (byte)'\0'; // used as string terminator private class MarshalerString extends Marshaler<String> { @@ -44,7 +46,7 @@ public class MarshalQueryableString implements MarshalQueryable<String> { @Override public void marshal(String value, ByteBuffer buffer) { - byte[] arr = value.getBytes(UTF8_CHARSET); + byte[] arr = value.getBytes(PreloadHolder.UTF8_CHARSET); buffer.put(arr); buffer.put(NUL); // metadata strings are NUL-terminated @@ -52,7 +54,7 @@ public class MarshalQueryableString implements MarshalQueryable<String> { @Override public int calculateMarshalSize(String value) { - byte[] arr = value.getBytes(UTF8_CHARSET); + byte[] arr = value.getBytes(PreloadHolder.UTF8_CHARSET); return arr.length + 1; // metadata strings are NUL-terminated } @@ -88,7 +90,7 @@ public class MarshalQueryableString implements MarshalQueryable<String> { buffer.get(strBytes, /*dstOffset*/0, stringLength + 1); // including null character // not including null character - return new String(strBytes, /*offset*/0, stringLength, UTF8_CHARSET); + return new String(strBytes, /*offset*/0, stringLength, PreloadHolder.UTF8_CHARSET); } @Override |