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.

Sign up for GitHub

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

Jump to bottom

[Android] Fix resolve exception issue #35551

Merged
merged 2 commits into from
Oct 2, 2024
Merged

[Android] Fix resolve exception issue #35551

merged 2 commits into from
Oct 2, 2024

Conversation

joonhaengHeo
Copy link
Contributor

Fix #35550
If two instances of the same instanceName are called at the same time, the resolve method will be called twice. In this case, resolve will fail for similar reasons to the previously reported issue. (#31899 - Fix PR is #32459)

To prevent this, the first searched item is saved in a separate variable, and resolveService is called after discover is stopped.

@semanticdiff-com SemanticDiff.com
Copy link

semanticdiff-com bot commented Sep 12, 2024 •
edited
Loading

Review changes with SemanticDiff.

Analyzed 1 of 1 files.

Overall, the semantic diff is 45% smaller than the GitHub diff.

Filename Status
✔️ src/platform/android/java/chip/platform/NsdServiceFinderAndResolver.java 44.49% smaller

@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 12, 2024 •
edited
Loading

PR #35551: Size comparison from ac289ed to 1cc1cdb

Full report (79 builds for bl602, bl702, bl702l, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section ac289ed 1cc1cdb change % change
bl602 lighting-app bl602 FLASH 1278156 1278156 0 0.0
RAM 95832 95832 0 0.0
bl602+mfd FLASH 1292010 1292010 0 0.0
RAM 95968 95968 0 0.0
bl602+rpc FLASH 1317120 1317120 0 0.0
RAM 104256 104256 0 0.0
bl702 lighting-app bl702 FLASH 943860 943860 0 0.0
RAM 15153 15153 0 0.0
bl702+mfd FLASH 946260 946260 0 0.0
RAM 15305 15305 0 0.0
bl702+rpc FLASH 1039180 1039180 0 0.0
RAM 24173 24173 0 0.0
bl706-eth FLASH 646056 646056 0 0.0
RAM 25241 25241 0 0.0
bl706-wifi FLASH 894048 894048 0 0.0
RAM 14477 14477 0 0.0
bl702l lighting-app bl702l FLASH 960520 960520 0 0.0
RAM 16812 16812 0 0.0
bl702l+mfd FLASH 963142 963142 0 0.0
RAM 16964 16964 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 677233 677233 0 0.0
RAM 78492 78492 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 697085 697085 0 0.0
RAM 81132 81132 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 697085 697085 0 0.0
RAM 81132 81132 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 654021 654021 0 0.0
RAM 73560 73560 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 613433 613433 0 0.0
RAM 71460 71460 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 633069 633069 0 0.0
RAM 74004 74004 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 633069 633069 0 0.0
RAM 74004 74004 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 632545 632545 0 0.0
RAM 74508 74508 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 652261 652261 0 0.0
RAM 77052 77052 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 652261 652261 0 0.0
RAM 77052 77052 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 608057 608057 0 0.0
RAM 68596 68596 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 627909 627909 0 0.0
RAM 71236 71236 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 627909 627909 0 0.0
RAM 71236 71236 0 0.0
efr32 lighting-app BRD4187C FLASH 932464 932464 0 0.0
RAM 135060 135060 0 0.0
lock-app BRD4338a FLASH 740572 740564 -8 -0.0
RAM 231244 231244 0 0.0
window-app BRD4187C FLASH 1015500 1015492 -8 -0.0
RAM 127000 127000 0 0.0
esp32 all-clusters-app c3devkit DRAM 94168 94168 0 0.0
FLASH 1539596 1539596 0 0.0
IRAM 82538 82538 0 0.0
m5stack DRAM 115112 115112 0 0.0
FLASH 1549894 1549894 0 0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4688 4688 0 0.0
FLASH 2771087 2771087 0 0.0
RAM 128928 128928 0 0.0
all-clusters-app debug unknown 5456 5456 0 0.0
FLASH 6082608 6082608 0 0.0
RAM 514432 514432 0 0.0
all-clusters-minimal-app debug unknown 5352 5352 0 0.0
FLASH 5406670 5406670 0 0.0
RAM 240784 240784 0 0.0
bridge-app debug unknown 5336 5336 0 0.0
FLASH 4740144 4740144 0 0.0
RAM 217824 217824 0 0.0
chip-tool debug unknown 5888 5888 0 0.0
FLASH 12676228 12676228 0 0.0
RAM 562250 562250 0 0.0
chip-tool-ipv6only arm64 unknown 20384 20384 0 0.0
FLASH 11341508 11341508 0 0.0
RAM 612376 612376 0 0.0
fabric-admin debug unknown 5720 5720 0 0.0
FLASH 10978807 10978807 0 0.0
RAM 561306 561306 0 0.0
fabric-bridge-app debug unknown 4568 4568 0 0.0
FLASH 4562880 4562880 0 0.0
RAM 204440 204440 0 0.0
lighting-app debug+rpc+ui unknown 5984 5984 0 0.0
FLASH 5676465 5676465 0 0.0
RAM 228112 228112 0 0.0
lock-app debug unknown 5272 5272 0 0.0
FLASH 4789428 4789428 0 0.0
RAM 203912 203912 0 0.0
ota-provider-app debug unknown 4648 4648 0 0.0
FLASH 4422612 4422612 0 0.0
RAM 197616 197616 0 0.0
ota-requestor-app debug unknown 4584 4584 0 0.0
FLASH 4561356 4561356 0 0.0
RAM 202184 202184 0 0.0
shell debug unknown 4216 4216 0 0.0
FLASH 3107773 3107773 0 0.0
RAM 159624 159624 0 0.0
thermostat-no-ble arm64 unknown 9336 9336 0 0.0
FLASH 4333156 4333156 0 0.0
RAM 242400 242400 0 0.0
tv-app debug unknown 5552 5552 0 0.0
FLASH 6022117 6022117 0 0.0
RAM 587104 587104 0 0.0
tv-casting-app debug unknown 5208 5208 0 0.0
FLASH 10883789 10883789 0 0.0
RAM 650224 650224 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 915168 915168 0 0.0
RAM 142272 142272 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 886472 886472 0 0.0
RAM 140411 140411 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 846520 846520 0 0.0
RAM 141090 141090 0 0.0
nxp contact k32w0+release FLASH 580500 580500 0 0.0
RAM 70712 70712 0 0.0
k32w1+release FLASH 593176 593176 0 0.0
RAM 62536 62536 0 0.0
mcxw71+release FLASH 592936 592936 0 0.0
RAM 62536 62536 0 0.0
light k32w0+release FLASH 616296 616296 0 0.0
RAM 70176 70176 0 0.0
k32w1+release FLASH 679448 679448 0 0.0
RAM 48160 48160 0 0.0
mcxw71+release FLASH 679464 679464 0 0.0
RAM 48160 48160 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1646988 1646988 0 0.0
RAM 210968 210968 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1550612 1550612 0 0.0
RAM 207680 207680 0 0.0
light cy8ckit_062s2_43012 FLASH 1466436 1466436 0 0.0
RAM 200672 200672 0 0.0
lock cy8ckit_062s2_43012 FLASH 1462956 1462956 0 0.0
RAM 225024 225024 0 0.0
qpg lighting-app qpg6105+debug FLASH 659060 659060 0 0.0
RAM 105220 105220 0 0.0
lock-app qpg6105+debug FLASH 616968 616968 0 0.0
RAM 99688 99688 0 0.0
stm32 light STM32WB5MM-DK FLASH 480544 480544 0 0.0
RAM 144676 144676 0 0.0
telink air-quality-sensor-app tlsr9528a_retention FLASH 621718 621718 0 0.0
RAM 50964 50964 0 0.0
all-clusters-app tlsr9118bdk40d FLASH 687326 687326 0 0.0
RAM 149608 149608 0 0.0
all-clusters-minimal-app tlsr9528a FLASH 779908 779908 0 0.0
RAM 110768 110768 0 0.0
bridge-app tlsr9258a FLASH 680802 680802 0 0.0
RAM 91620 91620 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 621482 621482 0 0.0
RAM 50916 50916 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 707514 707514 0 0.0
RAM 74256 74256 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 623742 623742 0 0.0
RAM 145500 145500 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 810036 810036 0 0.0
RAM 99424 99424 0 0.0
lock-app-dfu tlsr9528a FLASH 655346 655346 0 0.0
RAM 66976 66976 0 0.0
ota-requestor-app tlsr9258a FLASH 696778 696778 0 0.0
RAM 91212 91212 0 0.0
pump-app-usb tlsr9518adk80d FLASH 633094 633094 0 0.0
RAM 55784 55784 0 0.0
pump-controller-app tlsr9518adk80d FLASH 610282 610282 0 0.0
RAM 53028 53028 0 0.0
shell tlsr9518adk80d FLASH 467196 467196 0 0.0
RAM 68668 68668 0 0.0
smoke_co_alarm-app tlsr9528a_retention FLASH 628260 628260 0 0.0
RAM 52636 52636 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d FLASH 652418 652418 0 0.0
RAM 56576 56576 0 0.0
thermostat tlsr9518adk80d FLASH 637014 637014 0 0.0
RAM 53432 53432 0 0.0
window-covering tlsr9118bdk40d FLASH 522258 522258 0 0.0
RAM 98476 98476 0 0.0
tizen all-clusters-app arm unknown 4852 4852 0 0.0
FLASH 1724808 1724808 0 0.0
RAM 89608 89608 0 0.0
chip-tool-ubsan arm unknown 10284 10284 0 0.0
FLASH 17532010 17532010 0 0.0
RAM 7609740 7609740 0 0.0

@pullapprove pullapprove bot requested a review from jtov-sfy September 19, 2024 21:33
@yunhanw-google yunhanw-google enabled auto-merge (squash) September 30, 2024 05:22
@yunhanw-google yunhanw-google merged commit 4c07488 into project-chip:master Oct 2, 2024
68 checks passed
yyzhong-g pushed a commit to yyzhong-g/connectedhomeip that referenced this pull request Dec 12, 2024
@joonhaengHeo @restyled-commits @yyzhong-g
[Android] Fix resolve exception issue (project-chip#35551)
5f7e03a 
* Fix Android resolve exception issue

* Restyled by google-java-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
Reviewers

@yunhanw-google yunhanw-google yunhanw-google approved these changes

@andy31415 andy31415 andy31415 approved these changes

@andyg-apple andyg-apple Awaiting requested review from andyg-apple

@anush-apple anush-apple Awaiting requested review from anush-apple

@arkq arkq Awaiting requested review from arkq

@axelnxp axelnxp Awaiting requested review from axelnxp

@bauerschwan bauerschwan Awaiting requested review from bauerschwan

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@carol-apple carol-apple Awaiting requested review from carol-apple

@cecille cecille Awaiting requested review from cecille

@chapongatien chapongatien Awaiting requested review from chapongatien

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@cliffamzn cliffamzn Awaiting requested review from cliffamzn

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@doru91 doru91 Awaiting requested review from doru91

@fessehaeve fessehaeve Awaiting requested review from fessehaeve

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@hawk248 hawk248 Awaiting requested review from hawk248

@hicklin hicklin Awaiting requested review from hicklin

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@jmeg-sfy jmeg-sfy Awaiting requested review from jmeg-sfy

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@kiel-apple kiel-apple Awaiting requested review from kiel-apple

@kkasperczyk-no kkasperczyk-no Awaiting requested review from kkasperczyk-no

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@ksperling-apple ksperling-apple Awaiting requested review from ksperling-apple

@lazarkov lazarkov Awaiting requested review from lazarkov

@lpbeliveau-silabs lpbeliveau-silabs Awaiting requested review from lpbeliveau-silabs

@LuDuda LuDuda Awaiting requested review from LuDuda

@mhazley mhazley Awaiting requested review from mhazley

@mkardous-silabs mkardous-silabs Awaiting requested review from mkardous-silabs

@mspang mspang Awaiting requested review from mspang

@nivi-apple nivi-apple Awaiting requested review from nivi-apple

@p0fi p0fi Awaiting requested review from p0fi

@pidarped pidarped Awaiting requested review from pidarped

@plauric plauric Awaiting requested review from plauric

@rcasallas-silabs rcasallas-silabs Awaiting requested review from rcasallas-silabs

@ReneJosefsen ReneJosefsen Awaiting requested review from ReneJosefsen

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@sharadb-amazon sharadb-amazon Awaiting requested review from sharadb-amazon

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@tehampson tehampson Awaiting requested review from tehampson

@tima-q tima-q Awaiting requested review from tima-q

@tobiasgraf tobiasgraf Awaiting requested review from tobiasgraf

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wiba-nordic wiba-nordic Awaiting requested review from wiba-nordic

@woody-apple woody-apple Awaiting requested review from woody-apple

@younghak-hwang younghak-hwang Awaiting requested review from younghak-hwang

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

@jtov-sfy jtov-sfy Awaiting requested review from jtov-sfy

Assignees
No one assigned
Labels
fast track platform review - pending
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[BUG][Android] Resolve fail issue due to abnormal behavior of some Android devices
4 participants
@joonhaengHeo @andy31415 @yunhanw-google @restyled-commits