am 7c358ce4: Merge "Camera2: replace AssertionError with error log"

* commit '7c358ce4a1961612ed5f644ec8827010db545dec':
  Camera2: replace AssertionError with error log
This commit is contained in:
Zhijun He
2014-05-02 18:50:07 +00:00
committed by Android Git Automerger

View File

@@ -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));
}