From eaaf29303c48c2befe216151bf9bedc008a1b616 Mon Sep 17 00:00:00 2001 From: Andy Huibers Date: Mon, 28 Apr 2014 13:18:31 -0700 Subject: [PATCH] Add logging for failure conditions. Bug: 14364757 Change-Id: I252b1d79b94dabdc8960c7e243c50c8d50cb1306 --- src/com/android/camera/CameraActivity.java | 8 ++++---- src_pd/com/android/camera/util/UsageStatistics.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index a5a2914d8..a9a65265a 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -479,16 +479,15 @@ public class CameraActivity extends Activity @Override public void onCameraDisabled(int cameraId) { UsageStatistics.instance().cameraFailure( - eventprotos.CameraFailure.FailureReason.SECURITY); + eventprotos.CameraFailure.FailureReason.SECURITY, null); CameraUtil.showErrorAndFinish(this, R.string.camera_disabled); } @Override public void onDeviceOpenFailure(int cameraId, String info) { - // TODO: send "info" to UsageStatistics logging. UsageStatistics.instance().cameraFailure( - eventprotos.CameraFailure.FailureReason.OPEN_FAILURE); + eventprotos.CameraFailure.FailureReason.OPEN_FAILURE, info); CameraUtil.showErrorAndFinish(this, R.string.cannot_connect_camera); } @@ -500,7 +499,7 @@ public class CameraActivity extends Activity @Override public void onReconnectionFailure(CameraManager mgr) { UsageStatistics.instance().cameraFailure( - eventprotos.CameraFailure.FailureReason.RECONNECT_FAILURE); + eventprotos.CameraFailure.FailureReason.RECONNECT_FAILURE, null); CameraUtil.showErrorAndFinish(this, R.string.cannot_connect_camera); } @@ -1478,6 +1477,7 @@ public class CameraActivity extends Activity @Override public void onResume() { CameraPerformanceTracker.onEvent(CameraPerformanceTracker.ACTIVITY_RESUME); + Log.v(TAG, "Build info: " + Build.DISPLAY); mPaused = false; diff --git a/src_pd/com/android/camera/util/UsageStatistics.java b/src_pd/com/android/camera/util/UsageStatistics.java index 2598b0e2b..1826440bc 100644 --- a/src_pd/com/android/camera/util/UsageStatistics.java +++ b/src_pd/com/android/camera/util/UsageStatistics.java @@ -49,7 +49,7 @@ public class UsageStatistics { boolean front, boolean isHDR, float zoom) { } - public void cameraFailure(int cause) { + public void cameraFailure(int cause, String info) { } public void changeScreen(int newScreen, Integer interactionCause) { -- 2.11.0