Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Update Java8 Optional handling in JniReferences (#30071)" #30769

Merged
merged 1 commit into from
Dec 1, 2023
Merged

Revert "Update Java8 Optional handling in JniReferences (#30071)" #30769

merged 1 commit into from
Dec 1, 2023

Conversation

yufengwangca
Copy link
Contributor

@yufengwangca yufengwangca commented Dec 1, 2023

This reverts commit 4e438d6.

#30071 employs a randomly selected class to assess if the Java code supports Java 8 properly. The chosen class and method, sourced from src/controller/java, are arbitrary. However, it's important to note that all classes in this package are exclusively for controller functionalities. For commissionable devices, the implementation is confined to src/platform/android/java/chip/platform. Therefore, this approach may not be effective.

Additionally, considering that some vendors may opt for their own Android platform implementations, finding a common Java method using an Optional parameter and shared by both commissioner and commissionee devices is not feasible.

Fix: #30702

Copy link

github-actions bot commented Dec 1, 2023

PR #30769: Size comparison from 44ea4eb to 4c3c229

Decreases (1 build for efr32)
platform target config section 44ea4eb 4c3c229 change % change
efr32 lighting-app BRD4187C (read/write) 1100248 1100240 -8 -0.0
.text 900756 900748 -8 -0.0
Full report (72 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 44ea4eb 4c3c229 change % change
bl602 lighting-app bl602 (read/write) 1412798 1412798 0 0.0
.bss 85160 85160 0 0.0
.data 9376 9376 0 0.0
.rodata 156932 156932 0 0.0
.text 1080678 1080678 0 0.0
bl602+mfd (read/write) 1427254 1427254 0 0.0
.bss 85328 85328 0 0.0
.data 9344 9344 0 0.0
.rodata 155892 155892 0 0.0
.text 1096042 1096042 0 0.0
bl602+rpc (read/write) 1460574 1460574 0 0.0
.bss 93192 93192 0 0.0
.data 9744 9744 0 0.0
.rodata 164548 164548 0 0.0
.text 1112422 1112422 0 0.0
bl702 lighting-app bl702 (read only) 3478 3478 0 0.0
(read/write) 1177487 1177487 0 0.0
.bss 11197 11197 0 0.0
.data 3560 3560 0 0.0
.rodata 106304 106304 0 0.0
.text 950082 950082 0 0.0
bl702+mfd (read only) 3478 3478 0 0.0
(read/write) 1188355 1188355 0 0.0
.bss 11373 11373 0 0.0
.data 3536 3536 0 0.0
.rodata 105244 105244 0 0.0
.text 961890 961890 0 0.0
bl702+rpc (read only) 3478 3478 0 0.0
(read/write) 1277299 1277299 0 0.0
.bss 19677 19677 0 0.0
.data 4112 4112 0 0.0
.rodata 121720 121720 0 0.0
.text 1024888 1024888 0 0.0
bl706-eth (read/write) 997453 997453 0 0.0
.bss 23772 23772 0 0.0
.data 3128 3128 0 0.0
.rodata 99644 99644 0 0.0
.text 743318 743318 0 0.0
bl706-wifi (read/write) 1233746 1233746 0 0.0
.bss 10641 10641 0 0.0
.data 3568 3568 0 0.0
.rodata 120616 120616 0 0.0
.text 968778 968778 0 0.0
bl702l lighting-app bl702l (read/write) 1147692 1147692 0 0.0
.bss 16392 16392 0 0.0
.data 4920 4920 0 0.0
.rodata 100308 100308 0 0.0
.text 943172 943172 0 0.0
bl702l+mfd (read only) 512 512 0 0.0
(read/write) 1158384 1158384 0 0.0
.bss 16568 16568 0 0.0
.data 4904 4904 0 0.0
.rodata 99248 99248 0 0.0
.text 955292 955292 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 (read only) 742059 742059 0 0.0
(read/write) 167112 167112 0 0.0
.bss 89524 89524 0 0.0
.data 3424 3424 0 0.0
.rodata 84647 84647 0 0.0
.text 657020 657020 0 0.0
lock-ftd LP_EM_CC1354P10_6 (read only) 759235 759235 0 0.0
(read/write) 177356 177356 0 0.0
.bss 99708 99708 0 0.0
.data 3452 3452 0 0.0
.rodata 79727 79727 0 0.0
.text 679116 679116 0 0.0
lock-mtd LP_EM_CC1354P10_6 (read only) 746171 746171 0 0.0
(read/write) 171804 171804 0 0.0
.bss 94156 94156 0 0.0
.data 3452 3452 0 0.0
.rodata 105487 105487 0 0.0
.text 640296 640296 0 0.0
pump-app LP_EM_CC1354P10_6 (read only) 699707 699707 0 0.0
(read/write) 166124 166124 0 0.0
.bss 88304 88304 0 0.0
.data 3412 3412 0 0.0
.rodata 80415 80415 0 0.0
.text 618900 618900 0 0.0
pump-controller-app LP_EM_CC1354P10_6 (read only) 685211 685211 0 0.0
(read/write) 166288 166288 0 0.0
.bss 88480 88480 0 0.0
.data 3408 3408 0 0.0
.rodata 76247 76247 0 0.0
.text 608572 608572 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL (read only) 566458 566458 0 0.0
(read/write) 207624 207624 0 0.0
.bss 201084 201084 0 0.0
.data 1416 1416 0 0.0
.rodata 83930 83930 0 0.0
.text 480404 480404 0 0.0
lock CC3235SF_LAUNCHXL (read only) 619706 619706 0 0.0
(read/write) 208020 208020 0 0.0
.bss 201448 201448 0 0.0
.data 1452 1452 0 0.0
.rodata 105802 105802 0 0.0
.text 511784 511784 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 560487 560487 0 0.0
.app_xip_area 450777 450777 0 0.0
.bss 64624 64624 0 0.0
.data 664 664 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 542535 542535 0 0.0
.app_xip_area 428089 428089 0 0.0
.bss 69320 69320 0 0.0
.data 704 704 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 561375 561375 0 0.0
.app_xip_area 453121 453121 0 0.0
.bss 63240 63240 0 0.0
.data 592 592 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
switch cyw930739m2evb_01 (read/write) 556607 556607 0 0.0
.app_xip_area 445121 445121 0 0.0
.bss 66360 66360 0 0.0
.data 700 700 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A+rs9116 (read/write) 1015664 1015664 0 0.0
.bss 172568 172568 0 0.0
.data 2692 2692 0 0.0
.text 840384 840384 0 0.0
BRD4187C (read/write) 1100248 1100240 -8 -0.0
.bss 196172 196172 0 0.0
.data 3300 3300 0 0.0
.text 900756 900748 -8 -0.0
lock-app BRD4161A+wf200 (read/write) 1113432 1113432 0 0.0
.bss 188624 188624 0 0.0
.data 2716 2716 0 0.0
.text 922068 922068 0 0.0
window-app BRD4187C (read/write) 1134492 1134492 0 0.0
.bss 168204 168204 0 0.0
.data 3172 3172 0 0.0
.text 963096 963096 0 0.0
esp32 all-clusters-app c3devkit (read only) 1135810 1135810 0 0.0
(read/write) 1671268 1671268 0 0.0
.dram0.bss 72544 72544 0 0.0
.dram0.data 12996 12996 0 0.0
.flash.rodata 241856 241856 0 0.0
.flash.text 1135810 1135810 0 0.0
.iram0.text 75694 75694 0 0.0
m5stack (read only) 1181151 1181151 0 0.0
(read/write) 520880 520880 0 0.0
.dram0.bss 79184 79184 0 0.0
.dram0.data 34020 34020 0 0.0
.flash.rodata 273312 273312 0 0.0
.flash.text 1175767 1175767 0 0.0
.iram0.text 123907 123907 0 0.0
k32w contact k32w0+release (read only) 594196 594196 0 0.0
(read/write) 88132 88132 0 0.0
.bss 71376 71376 0 0.0
.data 2132 2132 0 0.0
.text 593660 593660 0 0.0
k32w1+release (read only) 1024 1024 0 0.0
(read/write) 689844 689844 0 0.0
.bss 67576 67576 0 0.0
.data 2720 2720 0 0.0
.text 576072 576072 0 0.0
light k32w0+release (read only) 593916 593916 0 0.0
(read/write) 87808 87808 0 0.0
.bss 71064 71064 0 0.0
.data 2120 2120 0 0.0
.text 593380 593380 0 0.0
k32w1+release (read only) 1024 1024 0 0.0
(read/write) 781688 781688 0 0.0
.bss 77252 77252 0 0.0
.data 1932 1932 0 0.0
.text 659048 659048 0 0.0
lock k32w0+release (read only) 565692 565692 0 0.0
(read/write) 85604 85604 0 0.0
.bss 68920 68920 0 0.0
.data 2060 2060 0 0.0
.text 565156 565156 0 0.0
linux air-purifier-app debug (read only) 2523645 2523645 0 0.0
(read/write) 127176 127176 0 0.0
.bss 46944 46944 0 0.0
.data 1472 1472 0 0.0
.data.rel.ro 72760 72760 0 0.0
.dynamic 608 608 0 0.0
.got 4568 4568 0 0.0
.init 27 27 0 0.0
.init_array 800 800 0 0.0
.rodata 178888 178888 0 0.0
.text 2169445 2169445 0 0.0
all-clusters-app debug (read only) 5356505 5356505 0 0.0
(read/write) 443648 443648 0 0.0
.bss 130064 130064 0 0.0
.data 3856 3856 0 0.0
.data.rel.ro 302496 302496 0 0.0
.dynamic 624 624 0 0.0
.got 5352 5352 0 0.0
.init 27 27 0 0.0
.init_array 1224 1224 0 0.0
.rodata 306268 306268 0 0.0
.text 4650163 4650163 0 0.0
all-clusters-minimal-app debug (read only) 4945953 4945953 0 0.0
(read/write) 234656 234656 0 0.0
.bss 127856 127856 0 0.0
.data 3792 3792 0 0.0
.data.rel.ro 95872 95872 0 0.0
.dynamic 624 624 0 0.0
.got 5312 5312 0 0.0
.init 27 27 0 0.0
.init_array 1160 1160 0 0.0
.rodata 272173 272173 0 0.0
.text 4441427 4441427 0 0.0
bridge-app debug (read only) 4413377 4413377 0 0.0
(read/write) 215864 215864 0 0.0
.bss 119224 119224 0 0.0
.data 4704 4704 0 0.0
.data.rel.ro 85200 85200 0 0.0
.dynamic 624 624 0 0.0
.got 5280 5280 0 0.0
.init 27 27 0 0.0
.init_array 824 824 0 0.0
.rodata 218677 218677 0 0.0
.text 3976195 3976195 0 0.0
chip-tool debug (read only) 11163785 11163785 0 0.0
(read/write) 486280 486280 0 0.0
.bss 94072 94072 0 0.0
.data 4994 4994 0 0.0
.data.rel.ro 379976 379976 0 0.0
.dynamic 624 624 0 0.0
.got 5784 5784 0 0.0
.init 27 27 0 0.0
.init_array 776 776 0 0.0
.rodata 411625 411625 0 0.0
.text 10093763 10093763 0 0.0
chip-tool-ipv6only arm64 (read only) 10944216 10944216 0 0.0
(read/write) 554960 554960 0 0.0
.bss 103352 103352 0 0.0
.data 4296 4296 0 0.0
.data.rel.ro 418528 418528 0 0.0
.dynamic 512 512 0 0.0
.got 19304 19304 0 0.0
.init 24 24 0 0.0
.init_array 248 248 0 0.0
.rodata 335168 335168 0 0.0
.text 9774424 9774424 0 0.0
lighting-app debug+rpc+ui (read only) 5298873 5298873 0 0.0
(read/write) 224936 224936 0 0.0
.bss 119360 119360 0 0.0
.data 4416 4416 0 0.0
.data.rel.ro 93616 93616 0 0.0
.dynamic 672 672 0 0.0
.got 5896 5896 0 0.0
.init 27 27 0 0.0
.init_array 960 960 0 0.0
.rodata 339892 339892 0 0.0
.text 4714259 4714259 0 0.0
lock-app debug (read only) 4499041 4499041 0 0.0
(read/write) 203584 203584 0 0.0
.bss 113760 113760 0 0.0
.data 3648 3648 0 0.0
.data.rel.ro 79432 79432 0 0.0
.dynamic 624 624 0 0.0
.got 5232 5232 0 0.0
.init 27 27 0 0.0
.init_array 856 856 0 0.0
.rodata 246645 246645 0 0.0
.text 4042451 4042451 0 0.0
ota-provider-app debug (read only) 4162745 4162745 0 0.0
(read/write) 192696 192696 0 0.0
.bss 113632 113632 0 0.0
.data 3920 3920 0 0.0
.data.rel.ro 69216 69216 0 0.0
.dynamic 624 624 0 0.0
.got 4544 4544 0 0.0
.init 27 27 0 0.0
.init_array 720 720 0 0.0
.rodata 200949 200949 0 0.0
.text 3769987 3769987 0 0.0
ota-requestor-app debug (read only) 4249145 4249145 0 0.0
(read/write) 196912 196912 0 0.0
.bss 114656 114656 0 0.0
.data 4192 4192 0 0.0
.data.rel.ro 72176 72176 0 0.0
.dynamic 624 624 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 776 776 0 0.0
.rodata 204757 204757 0 0.0
.text 3848275 3848275 0 0.0
shell debug (read only) 2776153 2776153 0 0.0
(read/write) 149792 149792 0 0.0
.bss 60616 60616 0 0.0
.data 784 784 0 0.0
.data.rel.ro 82584 82584 0 0.0
.dynamic 592 592 0 0.0
.got 4104 4104 0 0.0
.init 27 27 0 0.0
.init_array 1072 1072 0 0.0
.rodata 180928 180928 0 0.0
.text 2424562 2424562 0 0.0
thermostat-no-ble arm64 (read only) 4400080 4400080 0 0.0
(read/write) 246320 246320 0 0.0
.bss 122232 122232 0 0.0
.data 2800 2800 0 0.0
.data.rel.ro 102288 102288 0 0.0
.dynamic 512 512 0 0.0
.got 11944 11944 0 0.0
.init 24 24 0 0.0
.init_array 424 424 0 0.0
.rodata 161996 161996 0 0.0
.text 3897960 3897960 0 0.0
tv-app debug (read only) 5360329 5360329 0 0.0
(read/write) 348480 348480 0 0.0
.bss 244192 244192 0 0.0
.data 4992 4992 0 0.0
.data.rel.ro 91976 91976 0 0.0
.dynamic 624 624 0 0.0
.got 5520 5520 0 0.0
.init 27 27 0 0.0
.init_array 1144 1144 0 0.0
.rodata 271989 271989 0 0.0
.text 4851155 4851155 0 0.0
tv-casting-app debug (read only) 9102481 9102481 0 0.0
(read/write) 329912 329912 0 0.0
.bss 156192 156192 0 0.0
.data 2464 2464 0 0.0
.data.rel.ro 164424 164424 0 0.0
.dynamic 624 624 0 0.0
.got 5064 5064 0 0.0
.init 27 27 0 0.0
.init_array 1136 1136 0 0.0
.rodata 356488 356488 0 0.0
.text 8303571 8303571 0 0.0
mbed lock-app-release cy8cproto_062_4343w (read only) 6224 6224 0 0.0
(read/write) 2525472 2525472 0 0.0
.bss 220184 220184 0 0.0
.data 5144 5144 0 0.0
.text 1488156 1488156 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1060480 1060480 0 0.0
bss 129029 129029 0 0.0
rodata 104176 104176 0 0.0
text 779600 779600 0 0.0
nrf7002dk_nrf5340_cpuapp (read only) 4 4 0 0.0
(read/write) 1187008 1187008 0 0.0
bss 121239 121239 0 0.0
rodata 138304 138304 0 0.0
text 777140 777140 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1046064 1046064 0 0.0
bss 129316 129316 0 0.0
rodata 99432 99432 0 0.0
text 769652 769652 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 836224 836224 0 0.0
(read/write) 1740868 1740868 0 0.0
.bss 194644 194644 0 0.0
.data 2472 2472 0 0.0
.text 1535364 1535364 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 837936 837936 0 0.0
(read/write) 1705172 1705172 0 0.0
.bss 192924 192924 0 0.0
.data 2480 2480 0 0.0
.text 1501380 1501380 0 0.0
light cy8ckit_062s2_43012 (read only) 844624 844624 0 0.0
(read/write) 1630268 1630268 0 0.0
.bss 186348 186348 0 0.0
.data 2368 2368 0 0.0
.text 1433164 1433164 0 0.0
lock cy8ckit_062s2_43012 (read only) 817504 817504 0 0.0
(read/write) 1657164 1657164 0 0.0
.bss 213444 213444 0 0.0
.data 2392 2392 0 0.0
.text 1432940 1432940 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1115780 1115780 0 0.0
.bss 101200 101200 0 0.0
.data 744 744 0 0.0
.text 628160 628160 0 0.0
lock-app qpg6105+debug (read/write) 1079436 1079436 0 0.0
.bss 97328 97328 0 0.0
.data 788 788 0 0.0
.text 591812 591812 0 0.0
telink air-quality-sensor-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 819842 819842 0 0.0
bss 54904 54904 0 0.0
text 612522 612522 0 0.0
all-clusters-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1077360 1077360 0 0.0
bss 100072 100072 0 0.0
text 760072 760072 0 0.0
all-clusters-minimal-app tlsr9528a (read only) 4 4 0 0.0
(read/write) 1082596 1082596 0 0.0
bss 109764 109764 0 0.0
text 752080 752080 0 0.0
bridge-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 933696 933696 0 0.0
bss 94272 94272 0 0.0
text 645944 645944 0 0.0
contact-sensor-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 820018 820018 0 0.0
bss 54948 54948 0 0.0
text 612816 612816 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a (read only) 4 4 0 0.0
(read/write) 976608 976608 0 0.0
bss 78932 78932 0 0.0
text 692428 692428 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1091644 1091644 0 0.0
bss 99836 99836 0 0.0
text 768468 768468 0 0.0
lock-app-dfu tlsr9528a (read only) 4 4 0 0.0
(read/write) 963316 963316 0 0.0
bss 97196 97196 0 0.0
text 646554 646554 0 0.0
ota-requestor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 946968 946968 0 0.0
bss 92380 92380 0 0.0
text 661674 661674 0 0.0
pump-app tlsr9528a (read only) 4 4 0 0.0
(read/write) 878756 878756 0 0.0
bss 68924 68924 0 0.0
text 620776 620776 0 0.0
pump-controller-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 819360 819360 0 0.0
bss 57160 57160 0 0.0
text 587652 587652 0 0.0
shell tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 705404 705404 0 0.0
bss 73588 73588 0 0.0
text 461922 461922 0 0.0
smoke_co_alarm-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 821670 821670 0 0.0
bss 55084 55084 0 0.0
text 615488 615488 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 876145 876145 0 0.0
bss 60636 60636 0 0.0
text 629080 629080 0 0.0
thermostat tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 843572 843572 0 0.0
bss 57456 57456 0 0.0
text 605978 605978 0 0.0
window-covering tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 838064 838064 0 0.0
bss 57808 57808 0 0.0
text 600194 600194 0 0.0

@mergify mergify bot merged commit 6000c14 into project-chip:master Dec 1, 2023
57 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Regression caused by #30071 - android tv-app crashes
4 participants