diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-30 04:05:30 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-30 04:05:30 +0000 |
| commit | be7847e126a5cb493234080e7120a66d2b2f992c (patch) | |
| tree | 823188d70d1a0ddb965f2adcef56166e83b69232 | |
| parent | 3956fcbd71dc5bf900e9fb9d4df5f748e618d187 (diff) | |
| parent | e52af41550862775dfc3372daacf12873ce5eb8b (diff) | |
| download | openthread-android14-mainline-permission-release.tar.gz | |
Snap for 11155123 from e52af41550862775dfc3372daacf12873ce5eb8b to mainline-permission-releaseaml_per_341410020android14-mainline-permission-release
Change-Id: I8d1a7f75931980f978642ed0666341e69ab2c723
| -rw-r--r-- | TEST_MAPPING | 7 | ||||
| -rw-r--r-- | src/android/openthread-android-config.h | 5 | ||||
| -rw-r--r-- | src/core/meshcop/dataset_manager.cpp | 9 |
3 files changed, 15 insertions, 6 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING new file mode 100644 index 000000000..9bafe2943 --- /dev/null +++ b/TEST_MAPPING @@ -0,0 +1,7 @@ +{ + "imports": [ + { + "path": "external/ot-br-posix" + } + ] +} diff --git a/src/android/openthread-android-config.h b/src/android/openthread-android-config.h index 2aa291565..e61482d3a 100644 --- a/src/android/openthread-android-config.h +++ b/src/android/openthread-android-config.h @@ -45,10 +45,9 @@ #define OPENTHREAD_CONFIG_CLI_UART_RX_BUFFER_SIZE 3500 /** - * Disables the default posix infrastructure interface implementation - * so that we can can use the Android specific implementation. + * Enables the default posix infrastructure interface implementation. */ -#define OPENTHREAD_POSIX_CONFIG_INFRA_IF_ENABLE 0 +#define OPENTHREAD_POSIX_CONFIG_INFRA_IF_ENABLE 1 /** * Disables the default posix TUN interface implementation diff --git a/src/core/meshcop/dataset_manager.cpp b/src/core/meshcop/dataset_manager.cpp index 043f88c2a..e236fcc57 100644 --- a/src/core/meshcop/dataset_manager.cpp +++ b/src/core/meshcop/dataset_manager.cpp @@ -312,15 +312,18 @@ void DatasetManager::HandleMgmtSetResponse(Coap::Message *aMessage, const Ip6::M OT_UNUSED_VARIABLE(aMessageInfo); Error error; - uint8_t state; + uint8_t state = StateTlv::kPending; SuccessOrExit(error = aError); VerifyOrExit(Tlv::Find<StateTlv>(*aMessage, state) == kErrorNone && state != StateTlv::kPending, error = kErrorParse); + if (state == StateTlv::kReject) + { + error = kErrorRejected; + } exit: - LogInfo("MGMT_SET finished: %s", - error == kErrorNone ? StateTlv::StateToString(static_cast<StateTlv::State>(state)) : ErrorToString(error)); + LogInfo("MGMT_SET finished: %s", error == kErrorNone ? "Accepted" : ErrorToString(error)); mMgmtPending = false; |