diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-05-02 18:45:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-02 18:45:06 +0000 |
| commit | 25bb60e844e7981682b762c0bff0bf6325f14c54 (patch) | |
| tree | 4c54b433c57988306de5a18c319cc44cdd36fe09 /core/java/android/hardware/camera2 | |
| parent | 201a24f652745c4bcbe7e26f0ffea973bcb615b3 (diff) | |
| parent | 22589b47cda296c728a1a32e5a7c1b73f3eb39de (diff) | |
| download | frameworks_base-25bb60e844e7981682b762c0bff0bf6325f14c54.zip frameworks_base-25bb60e844e7981682b762c0bff0bf6325f14c54.tar.gz frameworks_base-25bb60e844e7981682b762c0bff0bf6325f14c54.tar.bz2 | |
Merge "Camera2: replace AssertionError with error log"
Diffstat (limited to 'core/java/android/hardware/camera2')
| -rw-r--r-- | core/java/android/hardware/camera2/impl/CameraDevice.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/impl/CameraDevice.java b/core/java/android/hardware/camera2/impl/CameraDevice.java index 40a7905..988f8f9 100644 --- a/core/java/android/hardware/camera2/impl/CameraDevice.java +++ b/core/java/android/hardware/camera2/impl/CameraDevice.java @@ -647,7 +647,7 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice { * should have arrived. The following line checks whether this holds. */ if (frameNumber != mCompletedFrameNumber + 1) { - throw new AssertionError(String.format( + Log.e(TAG, String.format( "result frame number %d comes out of order, should be %d + 1", frameNumber, mCompletedFrameNumber)); } |