Tweak log levels for photo, video
Adjusting log levels to insure some simple state flow statements
are printed for all clients at info, plus a few other adjustments.
Bug: 13737123
Change-Id: Ic58b2ad44067253960d68678c34d82895f49f6a6
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 405e3a2..287b93a 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1146,7 +1146,7 @@
= new CameraManager.CameraExceptionCallback() {
@Override
public void onCameraException(RuntimeException e) {
- Log.d(TAG, "Camera Exception", e);
+ Log.e(TAG, "Camera Exception", e);
CameraUtil.showErrorAndFinish(CameraActivity.this,
R.string.cannot_connect_camera);
}
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 010ab06..792bf13 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -430,7 +430,7 @@
}
SettingsManager settingsManager = mActivity.getSettingsManager();
- Log.v(TAG, "Start to switch camera. id=" + mPendingSwitchCameraId);
+ Log.i(TAG, "Start to switch camera. id=" + mPendingSwitchCameraId);
closeCamera();
mCameraId = mPendingSwitchCameraId;
settingsManager.set(SettingsManager.SETTING_CAMERA_ID, "" + mCameraId);
@@ -468,7 +468,7 @@
mPendingSwitchCameraId = state;
- Log.v(TAG, "Start to switch camera. cameraId=" + state);
+ Log.d(TAG, "Start to switch camera. cameraId=" + state);
// We need to keep a preview frame for the animation before
// releasing the camera. This will trigger
// onPreviewTextureCopied.
@@ -1139,7 +1139,7 @@
+ mActivity.getStorageSpaceBytes());
return;
}
- Log.v(TAG, "onShutterButtonClick: mCameraState=" + mCameraState);
+ Log.d(TAG, "onShutterButtonClick: mCameraState=" + mCameraState);
if (mSceneMode == CameraUtil.SCENE_MODE_HDR) {
mUI.setSwipingEnabled(false);
@@ -1513,7 +1513,7 @@
// Let UI set its expected aspect ratio
mCameraDevice.setPreviewTexture(mActivity.getCameraAppUI().getSurfaceTexture());
- Log.v(TAG, "startPreview");
+ Log.i(TAG, "startPreview");
mCameraDevice.startPreview();
mFocusManager.onPreviewStarted();
@@ -1527,7 +1527,7 @@
@Override
public void stopPreview() {
if (mCameraDevice != null && mCameraState != PREVIEW_STOPPED) {
- Log.v(TAG, "stopPreview");
+ Log.i(TAG, "stopPreview");
mCameraDevice.stopPreview();
mFaceDetectionStarted = false;
}
@@ -1675,7 +1675,7 @@
mUI.updatePreviewAspectRatio((float) optimalSize.width
/ (float) optimalSize.height);
}
- Log.v(TAG, "Preview size is " + optimalSize.width + "x" + optimalSize.height);
+ Log.i(TAG, "Preview size is " + optimalSize.width + "x" + optimalSize.height);
}
private void updateParametersPictureQuality() {
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index e35a718..31c3a6c 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -838,7 +838,7 @@
}
private void startPreview() {
- Log.v(TAG, "startPreview");
+ Log.i(TAG, "startPreview");
SurfaceTexture surfaceTexture = mActivity.getCameraAppUI().getSurfaceTexture();
if (!mPreferenceRead || surfaceTexture == null || mPaused == true ||
@@ -902,7 +902,7 @@
}
private void closeCamera() {
- Log.v(TAG, "closeCamera");
+ Log.i(TAG, "closeCamera");
if (mCameraDevice == null) {
Log.d(TAG, "already stopped.");
return;
@@ -1000,7 +1000,7 @@
// Prepares media recorder.
private void initializeRecorder() {
- Log.v(TAG, "initializeRecorder");
+ Log.i(TAG, "initializeRecorder");
// If the mCameraDevice is null, then this activity is going to finish
if (mCameraDevice == null) {
return;
@@ -1111,7 +1111,7 @@
}
private void releaseMediaRecorder() {
- Log.v(TAG, "Releasing media recorder.");
+ Log.i(TAG, "Releasing media recorder.");
if (mMediaRecorder != null) {
cleanupEmptyFile();
mMediaRecorder.reset();
@@ -1219,7 +1219,7 @@
}
private void startVideoRecording() {
- Log.v(TAG, "startVideoRecording");
+ Log.i(TAG, "startVideoRecording");
mUI.cancelAnimations();
mUI.setSwipingEnabled(false);
mUI.showFocusUI(false);
@@ -1227,7 +1227,7 @@
mActivity.updateStorageSpaceAndHint();
if (mActivity.getStorageSpaceBytes() <= Storage.LOW_STORAGE_THRESHOLD_BYTES) {
- Log.v(TAG, "Storage issue, ignore the start request");
+ Log.w(TAG, "Storage issue, ignore the start request");
return;
}
@@ -1313,7 +1313,7 @@
}
private boolean stopVideoRecording() {
- Log.v(TAG, "stopVideoRecording");
+ Log.i(TAG, "stopVideoRecording");
mUI.setSwipingEnabled(true);
mUI.showFocusUI(true);
mUI.showVideoRecordingHints(true);
@@ -1526,7 +1526,7 @@
if (!original.equals(optimalSize)) {
mParameters.setPictureSize(optimalSize.width, optimalSize.height);
}
- Log.v(TAG, "Video snapshot size is " + optimalSize.width + "x" +
+ Log.d(TAG, "Video snapshot size is " + optimalSize.width + "x" +
optimalSize.height);
// Set JPEG quality.