Commit be225b0

committed

See b/26741728. This fixes an issue reported by third party devs

in which the app sometimes crashes when locking/unlocking the device. Change-Id: I3ba4e6d77b79bec2db0e4417fb09794b6ff07645

1 parent a9e7d46 commit be225b0Copy full SHA for be225b0

File tree

1 file changed

+10

-4

lines changed

visionSamples/barcode-reader/app/src/main/java/com/google/android/gms/samples/vision/barcodereader/ui/camera
- CameraSource.java

1 file changed

+10

-4

lines changed

`‎visionSamples/barcode-reader/app/src/main/java/com/google/android/gms/samples/vision/barcodereader/ui/camera/CameraSource.java‎`

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,10 @@ private Camera createCamera() {`
`510`	`510`
`511`	`511`	`Camera.Parameters parameters = camera.getParameters();`
`512`	`512`
`513`		`- parameters.setPictureSize(pictureSize.getWidth(), pictureSize.getHeight());`
	`513`	`+ if (pictureSize != null) {`
	`514`	`+ parameters.setPictureSize(pictureSize.getWidth(), pictureSize.getHeight());`
	`515`	`+ }`
	`516`	`+`
`514`	`517`	`parameters.setPreviewSize(mPreviewSize.getWidth(), mPreviewSize.getHeight());`
`515`	`518`	`parameters.setPreviewFpsRange(`
`516`	`519`	`previewFpsRange[Camera.Parameters.PREVIEW_FPS_MIN_INDEX],`
`@@ -618,7 +621,9 @@ private static class SizePair {`
`618`	`621`	`public SizePair(android.hardware.Camera.Size previewSize,`
`619`	`622`	`android.hardware.Camera.Size pictureSize) {`
`620`	`623`	`mPreview = new Size(previewSize.width, previewSize.height);`
`621`		`- mPicture = new Size(pictureSize.width, pictureSize.height);`
	`624`	`+ if (pictureSize != null) {`
	`625`	`+ mPicture = new Size(pictureSize.width, pictureSize.height);`
	`626`	`+ }`
`622`	`627`	`}`
`623`	`628`
`624`	`629`	`public Size previewSize() {`
`@@ -862,8 +867,9 @@ void setNextFrame(byte[] data, Camera camera) {`
`862`	`867`	`}`
`863`	`868`
`864`	`869`	`if (!mBytesToByteBuffer.containsKey(data)) {`
`865`		`- Log.d(TAG, "Skipping frame. Could not find ByteBuffer associated with the " +`
`866`		`- "image data from the camera.");`
	`870`	`+ Log.d(TAG,`
	`871`	`+ "Skipping frame. Could not find ByteBuffer associated with the image " +`
	`872`	`+ "data from the camera.");`
`867`	`873`	`return;`
`868`	`874`	`}`
`869`	`875`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit be225b0

File tree

1 file changed

1 file changed

`‎visionSamples/barcode-reader/app/src/main/java/com/google/android/gms/samples/vision/barcodereader/ui/camera/CameraSource.java‎`

0 commit comments