Skip to content

Commit fb1bbdb

Browse files
committed
Fixed lint issues
1 parent 1160bff commit fb1bbdb

File tree

2 files changed

+27
-22
lines changed

2 files changed

+27
-22
lines changed

samples/camera/camera2/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
<uses-permission android:name="android.permission.CAMERA" />
2020
<uses-permission android:name="android.permission.RECORD_AUDIO" />
21+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
2122

2223
<uses-feature
2324
android:name="android.hardware.camera"

samples/camera/camera2/src/main/java/com/example/platform/camera/imagecapture/Camera2ImageCapture.kt

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -375,31 +375,35 @@ class Camera2ImageCapture : Fragment() {
375375
cameraId: String,
376376
handler: Handler? = null,
377377
): CameraDevice = suspendCancellableCoroutine { cont ->
378-
manager.openCamera(
379-
cameraId,
380-
object : CameraDevice.StateCallback() {
381-
override fun onOpened(device: CameraDevice) = cont.resume(device)
378+
try {
379+
manager.openCamera(
380+
cameraId,
381+
object : CameraDevice.StateCallback() {
382+
override fun onOpened(device: CameraDevice) = cont.resume(device)
382383

383-
override fun onDisconnected(device: CameraDevice) {
384-
Log.w(TAG, "Camera $cameraId has been disconnected")
385-
}
384+
override fun onDisconnected(device: CameraDevice) {
385+
Log.w(TAG, "Camera $cameraId has been disconnected")
386+
}
386387

387-
override fun onError(device: CameraDevice, error: Int) {
388-
val msg = when (error) {
389-
ERROR_CAMERA_DEVICE -> "Fatal (device)"
390-
ERROR_CAMERA_DISABLED -> "Device policy"
391-
ERROR_CAMERA_IN_USE -> "Camera in use"
392-
ERROR_CAMERA_SERVICE -> "Fatal (service)"
393-
ERROR_MAX_CAMERAS_IN_USE -> "Maximum cameras in use"
394-
else -> "Unknown"
388+
override fun onError(device: CameraDevice, error: Int) {
389+
val msg = when (error) {
390+
ERROR_CAMERA_DEVICE -> "Fatal (device)"
391+
ERROR_CAMERA_DISABLED -> "Device policy"
392+
ERROR_CAMERA_IN_USE -> "Camera in use"
393+
ERROR_CAMERA_SERVICE -> "Fatal (service)"
394+
ERROR_MAX_CAMERAS_IN_USE -> "Maximum cameras in use"
395+
else -> "Unknown"
396+
}
397+
val exc = RuntimeException("Camera $cameraId error: ($error) $msg")
398+
Log.e(TAG, exc.message, exc)
399+
if (cont.isActive) cont.resumeWithException(exc)
395400
}
396-
val exc = RuntimeException("Camera $cameraId error: ($error) $msg")
397-
Log.e(TAG, exc.message, exc)
398-
if (cont.isActive) cont.resumeWithException(exc)
399-
}
400-
},
401-
handler,
402-
)
401+
},
402+
handler,
403+
)
404+
} catch (e: SecurityException) {
405+
requestCameraPermission()
406+
}
403407
}
404408

405409
/**

0 commit comments

Comments
 (0)