From e1cfca1c10ade523e5df86437604596383ce1177 Mon Sep 17 00:00:00 2001 From: chenliming Date: Fri, 13 Jun 2025 01:20:39 +0000 Subject: [PATCH 1/4] update interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp. Signed-off-by: chenliming --- .../app_manager/src/appmgr/configuration_observer_proxy.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp index 05567b0a484..23c9b20cfa5 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp @@ -41,7 +41,10 @@ void ConfigurationObserverProxy::OnConfigurationUpdated(const Configuration& con if (!WriteInterfaceToken(data)) { return; } - data.WriteParcelable(&configuration); + //data.WriteParcelable(&configuration); + if (!data.WriteParcelable(&configuration)) { + return ; + } sptr remote = Remote(); if (remote == nullptr) { TAG_LOGE(AAFwkTag::APPMGR, "Remote() is NULL"); -- Gitee From 750e65d3f2d5a81c8ebdc15cc12f11a75a671acd Mon Sep 17 00:00:00 2001 From: chenliming Date: Fri, 13 Jun 2025 03:45:26 +0000 Subject: [PATCH 2/4] update interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp. Signed-off-by: chenliming --- .../app_manager/src/appmgr/configuration_observer_proxy.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp index 23c9b20cfa5..05567b0a484 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp @@ -41,10 +41,7 @@ void ConfigurationObserverProxy::OnConfigurationUpdated(const Configuration& con if (!WriteInterfaceToken(data)) { return; } - //data.WriteParcelable(&configuration); - if (!data.WriteParcelable(&configuration)) { - return ; - } + data.WriteParcelable(&configuration); sptr remote = Remote(); if (remote == nullptr) { TAG_LOGE(AAFwkTag::APPMGR, "Remote() is NULL"); -- Gitee From 513b81414c2b23919c069b77798033b5922a424c Mon Sep 17 00:00:00 2001 From: chenliming Date: Fri, 13 Jun 2025 03:47:03 +0000 Subject: [PATCH 3/4] update interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp. Signed-off-by: chenliming --- .../app_manager/src/appmgr/configuration_observer_proxy.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp index 05567b0a484..fb2ec9d2331 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/configuration_observer_proxy.cpp @@ -41,7 +41,9 @@ void ConfigurationObserverProxy::OnConfigurationUpdated(const Configuration& con if (!WriteInterfaceToken(data)) { return; } - data.WriteParcelable(&configuration); + if (!data.WriteParcelable(&configuration)) { + TAG_LOGE(AAFwkTag::APPMGR, "configuration is NULL"); + } sptr remote = Remote(); if (remote == nullptr) { TAG_LOGE(AAFwkTag::APPMGR, "Remote() is NULL"); -- Gitee From 0592b2f45f463836e1c28776861f86bb9c5c3d48 Mon Sep 17 00:00:00 2001 From: chenliming Date: Fri, 13 Jun 2025 06:09:07 +0000 Subject: [PATCH 4/4] update test/moduletest/mock/include/mock_configuration_observer.h. Signed-off-by: chenliming --- test/moduletest/mock/include/mock_configuration_observer.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/moduletest/mock/include/mock_configuration_observer.h b/test/moduletest/mock/include/mock_configuration_observer.h index 16613959381..4d96ab32110 100644 --- a/test/moduletest/mock/include/mock_configuration_observer.h +++ b/test/moduletest/mock/include/mock_configuration_observer.h @@ -31,6 +31,12 @@ public: { GTEST_LOG_(INFO) << "OnConfigurationUpdated"; } + + void test() + { + GTEST_LOG_(INFO) << "test"; + }; + }; } // namespace AppExecFwk } // namespace OHOS -- Gitee