diff options
| author | Senpo Hu <senpo@google.com> | 2014-10-14 22:00:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-14 22:00:52 +0000 |
| commit | 828081f5f947abb8930f084386492efde8c5b83b (patch) | |
| tree | e231472c05a7187e53a5f373f2fe2672cd950609 /src | |
| parent | c6a488761b2b9deb11bdcac051dfeacd212ee90f (diff) | |
| parent | 74b723c7093e5d8acf6f7170dd98f813a2185442 (diff) | |
| download | android_packages_apps_Camera2-828081f5f947abb8930f084386492efde8c5b83b.tar.gz android_packages_apps_Camera2-828081f5f947abb8930f084386492efde8c5b83b.tar.bz2 android_packages_apps_Camera2-828081f5f947abb8930f084386492efde8c5b83b.zip | |
Merge "Log camera exception via UsageStatistics." into ub-camera-glacier
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 5ead5c43a..af9af0fdf 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -538,8 +538,9 @@ public class CameraActivity extends QuickActivity @Override public void onCameraDisabled(int cameraId) { - UsageStatistics.instance().cameraFailure(eventprotos.CameraFailure.FailureReason.SECURITY, - null); + UsageStatistics.instance().cameraFailure( + eventprotos.CameraFailure.FailureReason.SECURITY, null, + UsageStatistics.NONE, UsageStatistics.NONE); Log.w(TAG, "Camera disabled: " + cameraId); CameraUtil.showErrorAndFinish(this, R.string.camera_disabled); } @@ -547,7 +548,8 @@ public class CameraActivity extends QuickActivity @Override public void onDeviceOpenFailure(int cameraId, String info) { UsageStatistics.instance().cameraFailure( - eventprotos.CameraFailure.FailureReason.OPEN_FAILURE, info); + eventprotos.CameraFailure.FailureReason.OPEN_FAILURE, info, + UsageStatistics.NONE, UsageStatistics.NONE); Log.w(TAG, "Camera open failure: " + info); CameraUtil.showErrorAndFinish(this, R.string.cannot_connect_camera); } @@ -561,7 +563,8 @@ public class CameraActivity extends QuickActivity @Override public void onReconnectionFailure(CameraAgent mgr, String info) { UsageStatistics.instance().cameraFailure( - eventprotos.CameraFailure.FailureReason.RECONNECT_FAILURE, null); + eventprotos.CameraFailure.FailureReason.RECONNECT_FAILURE, null, + UsageStatistics.NONE, UsageStatistics.NONE); Log.w(TAG, "Camera reconnection failure:" + info); CameraUtil.showErrorAndFinish(this, R.string.cannot_connect_camera); } @@ -1325,13 +1328,20 @@ public class CameraActivity extends QuickActivity Log.e(TAG, "Camera error callback. error=" + errorCode); } @Override - public void onCameraException(RuntimeException ex) { + public void onCameraException( + RuntimeException ex, String commandHistory, int action, int state) { Log.e(TAG, "Camera Exception", ex); + UsageStatistics.instance().cameraFailure( + eventprotos.CameraFailure.FailureReason.API_RUNTIME_EXCEPTION, + commandHistory, action, state); onFatalError(); } @Override public void onDispatchThreadException(RuntimeException ex) { Log.e(TAG, "DispatchThread Exception", ex); + UsageStatistics.instance().cameraFailure( + eventprotos.CameraFailure.FailureReason.API_TIMEOUT, + null, UsageStatistics.NONE, UsageStatistics.NONE); onFatalError(); } private void onFatalError() { |