commit b72d1efdefb9df324f615e14a9a2532cf7214a31
author Eino-Ville Talvala <etalvala@google.com> Mon Apr 28 13:21:18 2014 -0700
committer Eino-Ville Talvala <etalvala@google.com> Mon Apr 28 15:23:43 2014 -0700
tree 2eb1d6e817e728a5b02244f4739d5f7c8007189f
parent 47ffde252e550f86ed99f4b46c6d674bf69bbf37

CameraDevice: Make sure log tags are within length bounds.

Change-Id: I93c4670c1ee0b0be5956b0ed8cd0f53873257f7c

core/java/android/hardware/camera2/impl/CameraDevice.java

diff --git a/core/java/android/hardware/camera2/impl/CameraDevice.java b/core/java/android/hardware/camera2/impl/CameraDevice.java
index ee2adac..40a7905 100644
--- a/core/java/android/hardware/camera2/impl/CameraDevice.java
+++ b/core/java/android/hardware/camera2/impl/CameraDevice.java
@@ -157,7 +157,14 @@
         mCameraId = cameraId;
         mDeviceListener = listener;
         mDeviceHandler = handler;
-        TAG = String.format("CameraDevice-%s-JV", mCameraId);
+
+        final int MAX_TAG_LEN = 23;
+        String tag = String.format("CameraDevice-JV-%s", mCameraId);
+        if (tag.length() > MAX_TAG_LEN) {
+            tag = tag.substring(0, MAX_TAG_LEN);
+        }
+        TAG = tag;
+
         DEBUG = Log.isLoggable(TAG, Log.DEBUG);
     }