Revert "SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3"

This reverts commit b5533d51a7c97138235d29b35cec876d107aeadd.

Change-Id: I8063422680802e25d03a374be91e884a86ad55e9

2 files changed, 2 insertions, 7 deletions

diff --git a/src/com/android/camera/ui/Camera2FaceView.java b/src/com/android/camera/ui/Camera2FaceView.java
index 81be61f81..3b6d10541 100644..100755
--- a/src/com/android/camera/ui/Camera2FaceView.java
+++ b/src/com/android/camera/ui/Camera2FaceView.java
@@ -151,9 +151,7 @@ public class Camera2FaceView extends FaceView {
                 faceBound.offset(-mCameraBound.left, -mCameraBound.top);
                 mRect.set(faceBound);
                 translateMatrix.mapRect(mRect);
-                if (LOGV) CameraUtil.dumpRect(mRect, "Original rect");
                 mMatrix.mapRect(mRect);
-                if (LOGV) CameraUtil.dumpRect(mRect, "Transformed rect");
                 mPaint.setColor(mColor);
                 mRect.offset(dx, dy);
 
diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java
index 04b3664eb..b617891e5 100644..100755
--- a/src/com/android/camera/ui/FaceView.java
+++ b/src/com/android/camera/ui/FaceView.java
@@ -33,17 +33,14 @@ import android.view.View;
 
 import com.android.camera.PhotoUI;
 import com.android.camera.util.CameraUtil;
-import com.android.camera.util.PersistUtil;
 import org.codeaurora.snapcam.R;
 import org.codeaurora.snapcam.wrapper.ExtendedFaceWrapper;
 
 public class FaceView extends View
     implements FocusIndicator, Rotatable,
     PhotoUI.SurfaceTextureSizeChangedListener {
-    protected static final String TAG = "CAM_FaceView";
-    protected final boolean LOGV =
-            (PersistUtil.getCamera2Debug() == PersistUtil.CAMERA2_DEBUG_DUMP_LOG) ||
-            (PersistUtil.getCamera2Debug() == PersistUtil.CAMERA2_DEBUG_DUMP_ALL);
+    protected static final String TAG = "CAM FaceView";
+    protected final boolean LOGV = false;
     // The value for android.hardware.Camera.setDisplayOrientation.
     protected int mDisplayOrientation;
     // The orientation compensation for the face indicator to make it look