diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-05-02 18:50:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-02 18:50:07 +0000 |
| commit | 7db103bb2dc4e32903b7daddf6e27f8ba145ed5d (patch) | |
| tree | aa5df581bf33a97d81827b8bfae1712a8bd3ff43 | |
| parent | 1e976bd1acde57870664ecdc37f64d86d16b35e0 (diff) | |
| parent | 25bb60e844e7981682b762c0bff0bf6325f14c54 (diff) | |
| download | frameworks_base-7db103bb2dc4e32903b7daddf6e27f8ba145ed5d.zip frameworks_base-7db103bb2dc4e32903b7daddf6e27f8ba145ed5d.tar.gz frameworks_base-7db103bb2dc4e32903b7daddf6e27f8ba145ed5d.tar.bz2 | |
am 7c358ce4: Merge "Camera2: replace AssertionError with error log"
* commit '7c358ce4a1961612ed5f644ec8827010db545dec':
Camera2: replace AssertionError with error log
| -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)); } |