commit eaaf29303c48c2befe216151bf9bedc008a1b616
author Andy Huibers <andyhuibers@google.com> Mon Apr 28 13:18:31 2014 -0700
committer Andy Huibers <andyhuibers@google.com> Mon Apr 28 16:16:17 2014 -0700
tree 0e78ae2a679a61ad1e9757e0ad3e995bf652c5bf
parent 1b9d4fb6f649262e491c0fa743229b4930a87802

Add logging for failure conditions.

Bug: 14364757
Change-Id: I252b1d79b94dabdc8960c7e243c50c8d50cb1306

src/com/android/camera/CameraActivity.java

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index a5a2914..a9a6526 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -479,16 +479,15 @@
     @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 @@
     @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 @@
     @Override
     public void onResume() {
         CameraPerformanceTracker.onEvent(CameraPerformanceTracker.ACTIVITY_RESUME);
+        Log.v(TAG, "Build info: " + Build.DISPLAY);
 
         mPaused = false;
 

src_pd/com/android/camera/util/UsageStatistics.java

diff --git a/src_pd/com/android/camera/util/UsageStatistics.java b/src_pd/com/android/camera/util/UsageStatistics.java
index 2598b0e..1826440 100644
--- a/src_pd/com/android/camera/util/UsageStatistics.java
+++ b/src_pd/com/android/camera/util/UsageStatistics.java
@@ -49,7 +49,7 @@
                                       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) {