Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera2: Verbosity is verboten." into klp-dev

Browse Source
This commit is contained in:
Eino-Ville Talvala
2013-10-04 22:27:59 +00:00
committed by Android (Google) Code Review
parent a0364e2360 51ca8d6bc0
commit 3f48f6aa6c
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/hardware/camera2/impl/CameraMetadataNative.java
View File

@@ -35,6 +35,7 @@ import java.util.HashMap;
public class CameraMetadataNative extends CameraMetadata implements Parcelable {
private static final String TAG = "CameraMetadataJV";
private final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
public CameraMetadataNative() {
super();
@@ -400,11 +401,13 @@ public class CameraMetadataNative extends CameraMetadata implements Parcelable {
int remaining = buffer.remaining();
int arraySize = remaining / elementSize;
Log.v(TAG,
String.format(
if (VERBOSE) {
Log.v(TAG,
String.format(
"Attempting to unpack array (count = %d, element size = %d, bytes " +
"remaining = %d) for type %s",
"remaining = %d) for type %s",
arraySize, elementSize, remaining, type));
}
array = Array.newInstance(componentType, arraySize);
for (int i = 0; i < arraySize; ++i) {
@@ -565,8 +568,9 @@ public class CameraMetadataNative extends CameraMetadata implements Parcelable {
"Expected values array to be the same size as the enumTypes values "
+ values.length + " for type " + enumType);
}
Log.v(TAG, "Registered enum values for type " + enumType + " values");
if (VERBOSE) {
Log.v(TAG, "Registered enum values for type " + enumType + " values");
}
sEnumValues.put(enumType, values);
}
@@ -654,14 +658,18 @@ public class CameraMetadataNative extends CameraMetadata implements Parcelable {
static {
nativeClassInit();
Log.v(TAG, "Shall register metadata marshalers");
if (VERBOSE) {
Log.v(TAG, "Shall register metadata marshalers");
}
// load built-in marshallers
registerMarshaler(new MetadataMarshalRect());
registerMarshaler(new MetadataMarshalSize());
registerMarshaler(new MetadataMarshalString());
Log.v(TAG, "Registered metadata marshalers");
if (VERBOSE) {
Log.v(TAG, "Registered metadata marshalers");
}
}
}