Add placeholder for the string of params
Signed-off-by: Wei Jiangang <wei_jiangang@hoperun.com>
This commit is contained in:
parent
c22f0c7fb1
commit
8c56d8448d
28
0004-Add-placeholder-for-the-string-of-params.patch
Normal file
28
0004-Add-placeholder-for-the-string-of-params.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From 54dc0047537a1ac80621abf3b62efc2b4266b7c8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Wei Jiangang <wei_jiangang@hoperun.com>
|
||||||
|
Date: Mon, 1 Apr 2024 11:56:15 +0800
|
||||||
|
Subject: [PATCH] Add placeholder for the string of params
|
||||||
|
|
||||||
|
Signed-off-by: Wei Jiangang <wei_jiangang@hoperun.com>
|
||||||
|
---
|
||||||
|
services/service/src/device_manager_service.cpp | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp
|
||||||
|
index 904bca7c..f167f719 100755
|
||||||
|
--- a/services/service/src/device_manager_service.cpp
|
||||||
|
+++ b/services/service/src/device_manager_service.cpp
|
||||||
|
@@ -248,8 +248,8 @@ int32_t DeviceManagerService::GetFaParam(std::string &pkgName, DmAuthParam &auth
|
||||||
|
int32_t DeviceManagerService::SetUserOperation(std::string &pkgName, int32_t action, const std::string ¶ms)
|
||||||
|
{
|
||||||
|
if (pkgName.empty() || params.empty()) {
|
||||||
|
- LOGE("DeviceManagerService::SetUserOperation error: Invalid parameter, pkgName: %s", pkgName.c_str(),
|
||||||
|
- params.c_str());
|
||||||
|
+ LOGE("DeviceManagerService::SetUserOperation error: Invalid parameter, pkgName: %s, params: %s.",
|
||||||
|
+ pkgName.c_str(), params.c_str());
|
||||||
|
return ERR_DM_INPUT_PARA_INVALID;
|
||||||
|
}
|
||||||
|
if (!IsDMServiceImplReady()) {
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
Name: distributedhardware_device_manager
|
Name: distributedhardware_device_manager
|
||||||
Version: 1.0.0
|
Version: 1.0.0
|
||||||
Release: 4
|
Release: 5
|
||||||
Summary: Distributed middleware used components.
|
Summary: Distributed middleware used components.
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
Url: https://gitee.com/openharmony/
|
Url: https://gitee.com/openharmony/
|
||||||
@ -21,6 +21,7 @@ Source5: device_manager.xml
|
|||||||
Patch1: 0001-remove-dependency-and-adapt-for-build-device_manager.patch
|
Patch1: 0001-remove-dependency-and-adapt-for-build-device_manager.patch
|
||||||
Patch2: 0002-device-manager-only-support-for-network.patch
|
Patch2: 0002-device-manager-only-support-for-network.patch
|
||||||
Patch3: 0003-Fix-crash-for-nullptr-in-EstablishAuthChannel.patch
|
Patch3: 0003-Fix-crash-for-nullptr-in-EstablishAuthChannel.patch
|
||||||
|
Patch4: 0004-Add-placeholder-for-the-string-of-params.patch
|
||||||
|
|
||||||
BuildRequires: gcc, make, hilog, kernel-devel, uname-build-checks
|
BuildRequires: gcc, make, hilog, kernel-devel, uname-build-checks
|
||||||
BuildRequires: distributed-build, distributed-beget
|
BuildRequires: distributed-build, distributed-beget
|
||||||
@ -56,6 +57,7 @@ cp -rf %{_builddir}/build/openeuler/compiler_gn/* %{_builddir}
|
|||||||
%patch -P1 -p1 -d %{distributedhardware_dir}/device_manager
|
%patch -P1 -p1 -d %{distributedhardware_dir}/device_manager
|
||||||
%patch -P2 -p1 -d %{distributedhardware_dir}/device_manager
|
%patch -P2 -p1 -d %{distributedhardware_dir}/device_manager
|
||||||
%patch -P3 -p1 -d %{distributedhardware_dir}/device_manager
|
%patch -P3 -p1 -d %{distributedhardware_dir}/device_manager
|
||||||
|
%patch -P4 -p1 -d %{distributedhardware_dir}/device_manager
|
||||||
|
|
||||||
%setup -q -D -T -a 2 -c -n %{third_party_dir}/
|
%setup -q -D -T -a 2 -c -n %{third_party_dir}/
|
||||||
|
|
||||||
@ -118,6 +120,8 @@ ln -s /usr/include/device_manager %{buildroot}%{build_opt}/openeuler/compiler_gn
|
|||||||
/system/*
|
/system/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Apr 1 2024 wei_jiangang <wei_jiangang@hoperun.com> - 1.0.0-5
|
||||||
|
- Add placeholder for the string of params
|
||||||
* Wed Mar 27 2024 wei_jiangang <wei_jiangang@hoperun.com> - 1.0.0-4
|
* Wed Mar 27 2024 wei_jiangang <wei_jiangang@hoperun.com> - 1.0.0-4
|
||||||
- Fix crash while authenticating
|
- Fix crash while authenticating
|
||||||
* Tue Mar 26 2024 tianhang <tian_hang@hoperun.com> - 1.0.0-3
|
* Tue Mar 26 2024 tianhang <tian_hang@hoperun.com> - 1.0.0-3
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user