From 62143c218df4b1926b863a480bcb61f6d1021393 Mon Sep 17 00:00:00 2001 From: lishuo Date: Tue, 20 May 2025 06:24:07 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BC=BA=E5=9F=BA=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lishuo --- .../call_manager_service/src/call_manager_service.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/services/call_manager_service/src/call_manager_service.cpp b/services/call_manager_service/src/call_manager_service.cpp index 0f517852..f1616f50 100644 --- a/services/call_manager_service/src/call_manager_service.cpp +++ b/services/call_manager_service/src/call_manager_service.cpp @@ -975,13 +975,23 @@ int32_t CallManagerService::SetPreviewWindow(int32_t callId, std::string &surfac auto videoControlManager = DelayedSingleton::GetInstance(); if (videoControlManager != nullptr) { uint32_t callerToken = IPCSkeleton::GetCallingTokenID(); + int32_t ret = 0； if (surface == nullptr) { PrivacyKit::StopUsingPermission(callerToken, "ohos.permission.CAMERA"); + if (ret != 0 ) { + TELEPHONY_LOGE("StopUsingPermission faild!"); + } } else { sptr call = CallObjectManager::GetOneCallObjectByIndex(callId); if (call == nullptr || call->GetVideoStateType() != VideoStateType::TYPE_RECEIVE_ONLY) { PrivacyKit::AddPermissionUsedRecord(callerToken, "ohos.permission.CAMERA", 1, 0); + if (ret != 0 ) { + TELEPHONY_LOGE("AddPermissionUsedRecord faild!"); + } PrivacyKit::StartUsingPermission(callerToken, "ohos.permission.CAMERA"); + if (ret != 0 ) { + TELEPHONY_LOGE("StartUsingPermission faild!"); + } } } return videoControlManager->SetPreviewWindow(callId, surfaceId, surface); -- Gitee From bcd0c9a5e9771ca3c11993bfd7366b93a48d0a0f Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 22 May 2025 08:45:35 +0000 Subject: [PATCH 2/5] update services/call_manager_service/src/call_manager_service.cpp. Signed-off-by: lishuo --- .../src/call_manager_service.cpp | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/services/call_manager_service/src/call_manager_service.cpp b/services/call_manager_service/src/call_manager_service.cpp index f1616f50..71ec6100 100644 --- a/services/call_manager_service/src/call_manager_service.cpp +++ b/services/call_manager_service/src/call_manager_service.cpp @@ -973,32 +973,32 @@ int32_t CallManagerService::SetPreviewWindow(int32_t callId, std::string &surfac return TELEPHONY_ERR_PERMISSION_ERR; } auto videoControlManager = DelayedSingleton::GetInstance(); - if (videoControlManager != nullptr) { - uint32_t callerToken = IPCSkeleton::GetCallingTokenID(); - int32_t ret = 0； - if (surface == nullptr) { - PrivacyKit::StopUsingPermission(callerToken, "ohos.permission.CAMERA"); - if (ret != 0 ) { - TELEPHONY_LOGE("StopUsingPermission faild!"); + if (videoControlManager == nullptr) { + TELEPHONY_LOGE("videoControlManager is nullptr!"); + return TELEPHONY_ERR_LOCAL_PTR_NULL; + } + uint32_t callerToken = IPCSkeleton::GetCallingTokenID(); + int32_t ret = 0; + if (surface == nullptr) { + ret = PrivacyKit::StopUsingPermission(callerToken, "ohos.permission.CAMERA"); + + if (ret != 0) { + TELEPHONY_LOGE("StopUsingPermission faild!"); + } + } else { + sptr call = CallObjectManager::GetOneCallObjectByIndex(callId); + if (call == nullptr || call->GetVideoStateType() != VideoStateType::TYPE_RECEIVE_ONLY) { + PrivacyKit::AddPermissionUsedRecord(callerToken, "ohos.permission.CAMERA", 1, 0); + if (ret != 0) { + TELEPHONY_LOGE("AddPermissionUsedRecord faild!"); } - } else { - sptr call = CallObjectManager::GetOneCallObjectByIndex(callId); - if (call == nullptr || call->GetVideoStateType() != VideoStateType::TYPE_RECEIVE_ONLY) { - PrivacyKit::AddPermissionUsedRecord(callerToken, "ohos.permission.CAMERA", 1, 0); - if (ret != 0 ) { - TELEPHONY_LOGE("AddPermissionUsedRecord faild!"); - } - PrivacyKit::StartUsingPermission(callerToken, "ohos.permission.CAMERA"); - if (ret != 0 ) { - TELEPHONY_LOGE("StartUsingPermission faild!"); - } + PrivacyKit::StartUsingPermission(callerToken, "ohos.permission.CAMERA"); + if (ret != 0) { + TELEPHONY_LOGE("StartUsingPermission faild!"); } } - return videoControlManager->SetPreviewWindow(callId, surfaceId, surface); - } else { - TELEPHONY_LOGE("videoControlManager is nullptr!"); - return TELEPHONY_ERR_LOCAL_PTR_NULL; } + return videoControlManager->SetPreviewWindow(callId, surfaceId, surface); } int32_t CallManagerService::SetDisplayWindow(int32_t callId, std::string &surfaceId, sptr surface) -- Gitee From 1b96ad227adbd38b49bd6c79d891453efe734e4c Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 22 May 2025 08:47:07 +0000 Subject: [PATCH 3/5] update test/unittest/call_manager_zero_gtest/src/zero_branch7_test.cpp. Signed-off-by: lishuo --- .../call_manager_zero_gtest/src/zero_branch7_test.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/unittest/call_manager_zero_gtest/src/zero_branch7_test.cpp b/test/unittest/call_manager_zero_gtest/src/zero_branch7_test.cpp index 9b96fc8d..cca653ae 100644 --- a/test/unittest/call_manager_zero_gtest/src/zero_branch7_test.cpp +++ b/test/unittest/call_manager_zero_gtest/src/zero_branch7_test.cpp @@ -309,6 +309,13 @@ HWTEST_F(ZeroBranch8Test, Telephony_CallManagerService_003, Function | MediumTes EXPECT_NE(callManagerService->ControlCamera(1, test), TELEPHONY_ERR_LOCAL_PTR_NULL); EXPECT_NE(callManagerService->SetPreviewWindow(1, testStr, nullptr), TELEPHONY_ERR_LOCAL_PTR_NULL); EXPECT_NE(callManagerService->SetDisplayWindow(1, testStr, nullptr), TELEPHONY_ERR_LOCAL_PTR_NULL); + std::string testStr_ = "123"; + uint64_t tempSurfaceId = std::stoull(testStr_); + auto surface = SurfaceUtils::GetInstance()->GetSurface(tempSurfaceId); + if (surface == nullptr) { + testStr_ = ""; + } + callManagerService->SetPreviewWindow(0, testStr, surface); } /** -- Gitee From 2cb5bd693f87a2b45ba795b9e19aeba53ee0c813 Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 22 May 2025 08:49:29 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=E5=BC=BA=E5=9F=BA=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lishuo --- services/call_manager_service/src/call_manager_service.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/call_manager_service/src/call_manager_service.cpp b/services/call_manager_service/src/call_manager_service.cpp index 71ec6100..154edcc7 100644 --- a/services/call_manager_service/src/call_manager_service.cpp +++ b/services/call_manager_service/src/call_manager_service.cpp @@ -981,7 +981,6 @@ int32_t CallManagerService::SetPreviewWindow(int32_t callId, std::string &surfac int32_t ret = 0; if (surface == nullptr) { ret = PrivacyKit::StopUsingPermission(callerToken, "ohos.permission.CAMERA"); - if (ret != 0) { TELEPHONY_LOGE("StopUsingPermission faild!"); } -- Gitee From 257accfb3b9549dbee9d0a02fff9d8a3b5c717bc Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 22 May 2025 10:13:42 +0000 Subject: [PATCH 5/5] update test/unittest/call_manager_zero_gtest/src/zero_branch7_test.cpp. Signed-off-by: lishuo --- .../call_manager_zero_gtest/src/zero_branch7_test.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/unittest/call_manager_zero_gtest/src/zero_branch7_test.cpp b/test/unittest/call_manager_zero_gtest/src/zero_branch7_test.cpp index cca653ae..9b96fc8d 100644 --- a/test/unittest/call_manager_zero_gtest/src/zero_branch7_test.cpp +++ b/test/unittest/call_manager_zero_gtest/src/zero_branch7_test.cpp @@ -309,13 +309,6 @@ HWTEST_F(ZeroBranch8Test, Telephony_CallManagerService_003, Function | MediumTes EXPECT_NE(callManagerService->ControlCamera(1, test), TELEPHONY_ERR_LOCAL_PTR_NULL); EXPECT_NE(callManagerService->SetPreviewWindow(1, testStr, nullptr), TELEPHONY_ERR_LOCAL_PTR_NULL); EXPECT_NE(callManagerService->SetDisplayWindow(1, testStr, nullptr), TELEPHONY_ERR_LOCAL_PTR_NULL); - std::string testStr_ = "123"; - uint64_t tempSurfaceId = std::stoull(testStr_); - auto surface = SurfaceUtils::GetInstance()->GetSurface(tempSurfaceId); - if (surface == nullptr) { - testStr_ = ""; - } - callManagerService->SetPreviewWindow(0, testStr, surface); } /** -- Gitee