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

[Android] Return JSON in wildcard interactions #16258

Merged
merged 2 commits into from
Mar 16, 2022

Conversation

austinh0
Copy link
Contributor

Problem

  • Now that the TLV to JSON converter is implemented, we can return JSON alongside TLV and the object representation in the wildcard interaction callback.

Change overview

  • Add a JSONObject field to AttributeState, populated in the constructor by a JSON string.
  • Update JNI code to call new constructor.

Testing

  • Call wildcard read/subscribe and verified that correct JSON objects are returned.

@github-actions
Copy link

github-actions bot commented Mar 15, 2022

PR #16258: Size comparison from 046100b to 60f300d

Full report (18 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 046100b 60f300d change % change
cyw30739 light cyw930739m2evb_01 (read/write) 602866 602866 0 0.0
.app_xip_area 509948 509948 0 0.0
.bss 75672 75672 0 0.0
.data 596 596 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 560654 560654 0 0.0
.app_xip_area 469264 469264 0 0.0
.bss 74176 74176 0 0.0
.data 560 560 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 570530 570530 0 0.0
.app_xip_area 469492 469492 0 0.0
.bss 83480 83480 0 0.0
.data 520 520 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 920068 920068 0 0.0
(read/write) 128768 128768 0 0.0
.bss 126760 126760 0 0.0
.data 2008 2008 0 0.0
.text 920060 920060 0 0.0
BRD4161A+rpc (read only) 948872 948872 0 0.0
(read/write) 144728 144728 0 0.0
.bss 142536 142536 0 0.0
.data 2188 2188 0 0.0
.text 948864 948864 0 0.0
window-app BRD4161A (read only) 850816 850816 0 0.0
(read/write) 126728 126728 0 0.0
.bss 124864 124864 0 0.0
.data 1864 1864 0 0.0
.text 850808 850808 0 0.0
esp32 all-clusters-app c3devkit (read only) 961626 961626 0 0.0
(read/write) 1395066 1395066 0 0.0
.dram0.bss 64064 64064 0 0.0
.dram0.data 14188 14188 0 0.0
.flash.rodata 197904 197904 0 0.0
.flash.text 961626 961626 0 0.0
.iram0.text 62016 62016 0 0.0
m5stack (read only) 1017135 1017135 0 0.0
(read/write) 462284 462284 0 0.0
.dram0.bss 69592 69592 0 0.0
.dram0.data 34016 34016 0 0.0
.flash.rodata 226840 226840 0 0.0
.flash.text 1011751 1011751 0 0.0
.iram0.text 123107 123107 0 0.0
k32w light k32w061+release (read/write) 699568 699568 0 0.0
.bss 77640 77640 0 0.0
.data 1888 1888 0 0.0
.text 614240 614240 0 0.0
lock k32w061+release (read/write) 699872 699872 0 0.0
.bss 77632 77632 0 0.0
.data 1908 1908 0 0.0
.text 614532 614532 0 0.0
linux chip-tool-ipv6only arm64 (read only) 9753668 9753668 0 0.0
(read/write) 475441 475441 0 0.0
.bss 44017 44017 0 0.0
.data 1128 1128 0 0.0
.data.rel.ro 371232 371232 0 0.0
.dynamic 560 560 0 0.0
.got 55264 55264 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 492348 492348 0 0.0
.text 8211444 8211444 0 0.0
thermostat-no-ble arm64 (read only) 2207772 2207772 0 0.0
(read/write) 149409 149409 0 0.0
.bss 65681 65681 0 0.0
.data 1024 1024 0 0.0
.data.rel.ro 75368 75368 0 0.0
.dynamic 560 560 0 0.0
.got 4352 4352 0 0.0
.init 24 24 0 0.0
.init_array 360 360 0 0.0
.rodata 136908 136908 0 0.0
.text 1851552 1851552 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2352908 2352908 0 0.0
.bss 186660 186660 0 0.0
.data 5752 5752 0 0.0
.text 1315508 1315508 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1154267 1154267 0 0.0
bss 146740 146740 0 0.0
rodata 145356 145356 0 0.0
text 787028 787028 0 0.0
p6 all-clusters-app default (read/write) 2492256 2492256 0 0.0
.bss 120088 120088 0 0.0
.data 2632 2632 0 0.0
.text 1450520 1450520 0 0.0
light-app default (read/write) 2396104 2396104 0 0.0
.bss 113552 113552 0 0.0
.data 2488 2488 0 0.0
.text 1354368 1354368 0 0.0
lock-app default (read/write) 2359648 2359648 0 0.0
.bss 113296 113296 0 0.0
.data 2448 2448 0 0.0
.text 1317912 1317912 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 894098 894098 0 0.0
bss 87448 87448 0 0.0
noinit 37160 37160 0 0.0
text 632098 632098 0 0.0

@bzbarsky-apple bzbarsky-apple merged commit 570a5f5 into project-chip:master Mar 16, 2022
andrei-menzopol pushed a commit to andrei-menzopol/connectedhomeip that referenced this pull request Apr 14, 2022
* Return JSON to Java layer

* Restyled by clang-format

Co-authored-by: Restyled.io <commits@restyled.io>
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.

5 participants