SnapdragonCamera: Fix compilation

1. Address compilation due to compiler upgrade.
2. Comment out video dependencies to enable camera.
3. Fix compilation issue due to IMountService interface change.
4. Comment out ExtendedFace.
5. Remove non-standard video resolutions.
6. Revert "camera: override shutter sound volume" commit
   8a50cda8f72738e943904fdf7cae189b2b0a8ea8.

Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a

1 files changed, 3 insertions, 1 deletions

diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java
index 167aec030..139517067 100644
--- a/src/com/android/camera/ui/FaceView.java
+++ b/src/com/android/camera/ui/FaceView.java
@@ -34,7 +34,7 @@ import android.view.View;
 import com.android.camera.PhotoUI;
 import com.android.camera.util.CameraUtil;
 import org.codeaurora.snapcam.R;
-import org.codeaurora.camera.ExtendedFace;
+//import org.codeaurora.camera.ExtendedFace;
 
 public class FaceView extends View
     implements FocusIndicator, Rotatable,
@@ -232,6 +232,7 @@ public class FaceView extends View
                 mPaint.setColor(mColor);
                 mRect.offset(dx, dy);
                 canvas.drawOval(mRect, mPaint);
+/*
                 if (mFaces[i] instanceof ExtendedFace) {
                     ExtendedFace face = (ExtendedFace)mFaces[i];
                     float[] point = new float[4];
@@ -390,6 +391,7 @@ public class FaceView extends View
                         }
                     }
                 }
+*/
             }
             canvas.restore();
         }