Commit 8a2fa29 1 parent 3393e03 commit 8a2fa29 Copy full SHA for 8a2fa29
File tree 2 files changed +23
-19
lines changed
java/app/grapheneos/camera
2 files changed +23
-19
lines changed Original file line number Diff line number Diff line change @@ -1289,29 +1289,33 @@ class CamConfig(private val mActivity: MainActivity) {
1289
1289
mActivity.forceUpdateOrientationSensor()
1290
1290
1291
1291
try {
1292
- camera = cameraProvider!! .bindToLifecycle(
1293
- mActivity, cameraSelector,
1294
- useCaseGroupBuilder.build()
1295
- )
1296
- } catch (exception : IllegalArgumentException ) {
1297
- if (isVideoMode) {
1298
- val newUseCaseGroupBuilder = UseCaseGroup .Builder ()
1299
- videoCapture?.let {
1300
- newUseCaseGroupBuilder.addUseCase(it)
1301
- }
1302
- preview?.let {
1303
- newUseCaseGroupBuilder.addUseCase(it)
1304
- }
1305
- imageCapture = null
1306
-
1292
+ try {
1307
1293
camera = cameraProvider!! .bindToLifecycle(
1308
1294
mActivity, cameraSelector,
1309
- newUseCaseGroupBuilder .build()
1295
+ useCaseGroupBuilder .build()
1310
1296
)
1297
+ } catch (exception: IllegalArgumentException ) {
1298
+ if (isVideoMode) {
1299
+ val newUseCaseGroupBuilder = UseCaseGroup .Builder ()
1300
+ videoCapture?.let {
1301
+ newUseCaseGroupBuilder.addUseCase(it)
1302
+ }
1303
+ preview?.let {
1304
+ newUseCaseGroupBuilder.addUseCase(it)
1305
+ }
1306
+ imageCapture = null
1311
1307
1312
- } else {
1313
- throw exception
1308
+ camera = cameraProvider!! .bindToLifecycle(
1309
+ mActivity, cameraSelector,
1310
+ newUseCaseGroupBuilder.build()
1311
+ )
1312
+ } else {
1313
+ throw exception
1314
+ }
1314
1315
}
1316
+ } catch (exception: IllegalArgumentException ) {
1317
+ mActivity.showMessage(mActivity.getString(R .string.bind_failure))
1318
+ return
1315
1319
}
1316
1320
1317
1321
loadTabs()
Original file line number Diff line number Diff line change 112
112
<string name =" cancel" >Cancel</string >
113
113
<string name =" no_image" >Please capture a photo/video before trying to view them.</string >
114
114
115
-
115
+ < string name = " bind_failure " >Failed to open camera due to an OS or hardware issue. Try rebooting.</ string >
116
116
</resources >
You can’t perform that action at this time.
0 commit comments