Repository navigation
Commit 94fda02
committed
[camera_android] Fix stopVideoRecording returning JPEG path during recording
Separate still-image and video capture file fields so takePicture() cannot
overwrite the path returned by stopVideoRecording().
Fixes flutter/flutter#1929271 parent d5ec6db commit 94fda02
4 files changed
Lines changed: 111 additions & 8 deletions
File tree
- packages/camera/camera_android
- android/src
- main/java/io/flutter/plugins/camera
- test/java/io/flutter/plugins/camera
- example/integration_test
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
1 | 5 | | |
2 | 6 | | |
3 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
138 | | - | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
139 | 150 | | |
140 | 151 | | |
141 | 152 | | |
| |||
883 | 894 | | |
884 | 895 | | |
885 | 896 | | |
886 | | - | |
| 897 | + | |
887 | 898 | | |
888 | 899 | | |
889 | 900 | | |
| |||
920 | 931 | | |
921 | 932 | | |
922 | 933 | | |
923 | | - | |
924 | | - | |
| 934 | + | |
| 935 | + | |
| 936 | + | |
| 937 | + | |
| 938 | + | |
| 939 | + | |
| 940 | + | |
| 941 | + | |
925 | 942 | | |
926 | 943 | | |
927 | 944 | | |
| |||
1301 | 1318 | | |
1302 | 1319 | | |
1303 | 1320 | | |
1304 | | - | |
| 1321 | + | |
1305 | 1322 | | |
1306 | 1323 | | |
1307 | 1324 | | |
1308 | | - | |
| 1325 | + | |
1309 | 1326 | | |
1310 | 1327 | | |
1311 | 1328 | | |
1312 | 1329 | | |
1313 | 1330 | | |
1314 | 1331 | | |
1315 | | - | |
| 1332 | + | |
1316 | 1333 | | |
1317 | 1334 | | |
1318 | | - | |
| 1335 | + | |
1319 | 1336 | | |
1320 | 1337 | | |
1321 | 1338 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| |||
1518 | 1519 | | |
1519 | 1520 | | |
1520 | 1521 | | |
| 1522 | + | |
| 1523 | + | |
| 1524 | + | |
| 1525 | + | |
| 1526 | + | |
| 1527 | + | |
| 1528 | + | |
| 1529 | + | |
| 1530 | + | |
| 1531 | + | |
| 1532 | + | |
| 1533 | + | |
| 1534 | + | |
| 1535 | + | |
| 1536 | + | |
| 1537 | + | |
| 1538 | + | |
| 1539 | + | |
| 1540 | + | |
| 1541 | + | |
| 1542 | + | |
| 1543 | + | |
| 1544 | + | |
| 1545 | + | |
| 1546 | + | |
| 1547 | + | |
| 1548 | + | |
| 1549 | + | |
| 1550 | + | |
| 1551 | + | |
| 1552 | + | |
| 1553 | + | |
| 1554 | + | |
| 1555 | + | |
| 1556 | + | |
| 1557 | + | |
| 1558 | + | |
| 1559 | + | |
| 1560 | + | |
| 1561 | + | |
| 1562 | + | |
| 1563 | + | |
| 1564 | + | |
| 1565 | + | |
| 1566 | + | |
| 1567 | + | |
| 1568 | + | |
| 1569 | + | |
| 1570 | + | |
| 1571 | + | |
| 1572 | + | |
| 1573 | + | |
| 1574 | + | |
| 1575 | + | |
1521 | 1576 | | |
1522 | 1577 | | |
1523 | 1578 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
398 | 398 | | |
399 | 399 | | |
400 | 400 | | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
401 | 428 | | |
402 | 429 | | |
0 commit comments