diff --git a/frameworks/native/system_sound_manager/system_sound_manager_impl.cpp b/frameworks/native/system_sound_manager/system_sound_manager_impl.cpp index e90a9c375479e1f781b771957124f49250a908fc..af429e1e46dbea272d038edc83b07254efdbc2e6 100644 --- a/frameworks/native/system_sound_manager/system_sound_manager_impl.cpp +++ b/frameworks/native/system_sound_manager/system_sound_manager_impl.cpp @@ -659,7 +659,6 @@ ToneAttrs SystemSoundManagerImpl::GetRingtoneAttrsByType(const DatabaseTool &dat } Uri queryUri(ringtoneLibraryUri); auto resultSet = databaseTool.dataShareHelper->Query(queryUri, queryPredicates, COLUMNS, &businessError); - MEDIA_LOGI("GetRingtoneAttrsByType: dataShareHelper->Query: errCode %{public}d", businessError.GetCode()); auto results = make_unique>(move(resultSet)); if (results == nullptr) { MEDIA_LOGE("GetRingtoneAttrsByType: results is nullptr!"); @@ -705,7 +704,6 @@ std::string SystemSoundManagerImpl::GetPresetRingToneUriByType(const DatabaseToo } Uri queryUri(ringtoneLibraryUri); auto resultSet = databaseTool.dataShareHelper->Query(queryUri, queryPredicates, COLUMNS, &businessError); - MEDIA_LOGI("dataShareHelper->Query: errCode %{public}d", businessError.GetCode()); auto results = make_unique>(move(resultSet)); CHECK_AND_RETURN_RET_LOG(results != nullptr, uri, "query failed, ringtone library error."); unique_ptr ringtoneAsset = results->GetFirstObject(); @@ -741,7 +739,6 @@ ToneAttrs SystemSoundManagerImpl::GetPresetRingToneAttrByType(const DatabaseTool } Uri queryUri(ringtoneLibraryUri); auto resultSet = databaseTool.dataShareHelper->Query(queryUri, queryPredicates, COLUMNS, &businessError); - MEDIA_LOGI("GetPresetRingToneAttrByType: dataShareHelper->Query: errCode %{public}d", businessError.GetCode()); auto results = make_unique>(move(resultSet)); if (results == nullptr) { MEDIA_LOGE("GetPresetRingToneAttrByType: query failed, ringtone library error!"); @@ -1137,7 +1134,6 @@ std::string SystemSoundManagerImpl::GetShotToneUriByType(const DatabaseTool &dat } Uri queryUri(ringtoneLibraryUri); auto resultSet = databaseTool.dataShareHelper->Query(queryUri, queryPredicates, COLUMNS, &businessError); - MEDIA_LOGI("dataShareHelper->Query: errCode %{public}d", businessError.GetCode()); auto results = make_unique>(move(resultSet)); CHECK_AND_RETURN_RET_LOG(results != nullptr, uri, "query failed, ringtone library error."); unique_ptr ringtoneAsset = results->GetFirstObject(); @@ -1172,7 +1168,6 @@ std::string SystemSoundManagerImpl::GetPresetShotToneUriByType(const DatabaseToo } Uri queryUri(ringtoneLibraryUri); auto resultSet = databaseTool.dataShareHelper->Query(queryUri, queryPredicates, COLUMNS, &businessError); - MEDIA_LOGI("dataShareHelper->Query: errCode %{public}d", businessError.GetCode()); auto results = make_unique>(move(resultSet)); CHECK_AND_RETURN_RET_LOG(results != nullptr, uri, "query failed, ringtone library error."); unique_ptr ringtoneAsset = results->GetFirstObject(); @@ -1206,7 +1201,6 @@ std::string SystemSoundManagerImpl::GetNotificationToneUriByType(const DatabaseT } Uri queryUri(ringtoneLibraryUri); auto resultSet = databaseTool.dataShareHelper->Query(queryUri, queryPredicates, COLUMNS, &businessError); - MEDIA_LOGI("dataShareHelper->Query: errCode %{public}d", businessError.GetCode()); auto results = make_unique>(move(resultSet)); CHECK_AND_RETURN_RET_LOG(results != nullptr, uri, "query failed, ringtone library error."); unique_ptr ringtoneAsset = results->GetFirstObject(); @@ -1240,7 +1234,6 @@ std::string SystemSoundManagerImpl::GetPresetNotificationToneUri(const DatabaseT } Uri queryUri(ringtoneLibraryUri); auto resultSet = databaseTool.dataShareHelper->Query(queryUri, queryPredicates, COLUMNS, &businessError); - MEDIA_LOGI("dataShareHelper->Query: errCode %{public}d", businessError.GetCode()); auto results = make_unique>(move(resultSet)); CHECK_AND_RETURN_RET_LOG(results != nullptr, uri, "query failed, ringtone library error."); unique_ptr ringtoneAsset = results->GetFirstObject(); @@ -1596,7 +1589,6 @@ std::string SystemSoundManagerImpl::GetAlarmToneUri(const std::shared_ptr> SystemSoundManagerImpl::GetAlarmToneAttr Security::AccessToken::AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); int32_t result = Security::AccessToken::AccessTokenKit::VerifyAccessToken(tokenCaller, "ohos.permission.ACCESS_CUSTOM_RINGTONE"); - MEDIA_LOGI("GetAlarmToneAttrList: errCode:%{public}d, result :%{public}d ", errCode, result); if (errCode != 0 || result != Security::AccessToken::PermissionState::PERMISSION_GRANTED || !SystemSoundManagerUtils::GetScannerFirstParameter(RINGTONE_PARAMETER_SCANNER_FIRST_KEY, RINGTONEPARA_SIZE) || !SystemSoundManagerUtils::CheckCurrentUser()) { @@ -2401,7 +2392,6 @@ std::unique_ptr SystemSoundManagerImpl::GetSimcardSettingAs Uri queryUri(ringtoneLibraryUri); auto resultSet = databaseTool.dataShareHelper->Query(queryUri, queryPredicates, SETTING_TABLE_COLUMNS, &businessError); - MEDIA_LOGI("dataShareHelper->Query: errCode %{public}d", businessError.GetCode()); auto results = make_unique>(move(resultSet)); unique_ptr simcardSettingAsset = results->GetFirstObject(); return simcardSettingAsset; @@ -3037,8 +3027,6 @@ std::string SystemSoundManagerImpl::OpenAudioUri(const DatabaseTool &databaseToo } Uri queryUri(ringtoneLibraryUri); auto resultSet = databaseTool.dataShareHelper->Query(queryUri, queryPredicates, columns, &businessError); - MEDIA_LOGI("dataShareHelper->Query: errCode %{public}d", businessError.GetCode()); - auto results = make_unique>(move(resultSet)); unique_ptr ringtoneAsset = results->GetFirstObject(); if (ringtoneAsset == nullptr) { @@ -3117,7 +3105,6 @@ std::string SystemSoundManagerImpl::OpenHapticsUri(const DatabaseTool &databaseT } Uri queryUri(vibrateFilesUri); auto resultSet = databaseTool.dataShareHelper->Query(queryUri, queryPredicates, columns, &businessError); - MEDIA_LOGI("dataShareHelper->Query: errCode %{public}d", businessError.GetCode()); auto results = make_unique>(move(resultSet)); unique_ptr vibrateAssetByUri = results->GetFirstObject(); if (vibrateAssetByUri == nullptr) { diff --git a/frameworks/native/system_sound_manager/system_sound_manager_utils.cpp b/frameworks/native/system_sound_manager/system_sound_manager_utils.cpp index f9e8ccbec7f25525854aec9c138b851e53291931..fb92862f6a75cb915c4cb01ade331697621efb3e 100644 --- a/frameworks/native/system_sound_manager/system_sound_manager_utils.cpp +++ b/frameworks/native/system_sound_manager/system_sound_manager_utils.cpp @@ -118,7 +118,6 @@ bool SystemSoundManagerUtils::VerifyCustomPath(const std::string &audioUri) bool SystemSoundManagerUtils::IdExists(const std::string &ids, int32_t id) { - MEDIA_LOGI("IdExists Start."); if (ids.empty()) { return false; } @@ -140,11 +139,9 @@ bool SystemSoundManagerUtils::IdExists(const std::string &ids, int32_t id) bool SystemSoundManagerUtils::CheckCurrentUser() { - MEDIA_LOGI("CheckCurrentUser Start."); char paramValue[RINGTONEPARA_SIZE] = {0}; GetParameter(RINGTONE_PARAMETER_SCANNER_USERID_KEY, "", paramValue, RINGTONEPARA_SIZE); std::string ids(paramValue); - MEDIA_LOGI("GetParameter end, paramValue: %{private}s .", ids.c_str()); int32_t currentUserId = GetCurrentUserId(); if (IdExists(ids, currentUserId)) { return true; diff --git a/frameworks/native/system_sound_manager/system_tone_player/system_tone_player_impl.cpp b/frameworks/native/system_sound_manager/system_tone_player/system_tone_player_impl.cpp index 90c1c6bba00eae7b354ed1166a9f8d8de519bc31..dfe354e375374534c86654dbd12b97703689bc9c 100644 --- a/frameworks/native/system_sound_manager/system_tone_player/system_tone_player_impl.cpp +++ b/frameworks/native/system_sound_manager/system_tone_player/system_tone_player_impl.cpp @@ -660,7 +660,6 @@ int32_t SystemTonePlayerImpl::GetHapticsFeature(ToneHapticsFeature &feature) bool SystemTonePlayerImpl::IsStreamIdExist(int32_t streamId) { - MEDIA_LOGI("Query streamId: %{public}d", streamId); std::lock_guard lock(systemTonePlayerMutex_); return (playerMap_.count(streamId) != 0 && playerMap_[streamId] != nullptr) || callbackThreadIdMap_.count(streamId) != 0; @@ -797,7 +796,6 @@ void SystemTonePlayerImpl::CreateCallbackThread(int32_t delayTime) delayTime = std::max(delayTime, DEFAULT_DELAY); std::weak_ptr systemTonePlayerImpl = shared_from_this(); std::thread t = std::thread([systemTonePlayerImpl, streamId = streamId_, delayTime]() { - MEDIA_LOGI("CreateCallbackThread: streamId %{public}d, delayTime %{public}d", streamId, delayTime); this_thread::sleep_for(std::chrono::milliseconds(delayTime)); std::shared_ptr player = systemTonePlayerImpl.lock(); if (player == nullptr) { @@ -824,13 +822,11 @@ void SystemTonePlayerImpl::DeleteCallbackThreadId(int32_t streamId) void SystemTonePlayerImpl::DeleteAllCallbackThreadId() { - MEDIA_LOGI("Delete all callback thread id!"); callbackThreadIdMap_.clear(); } bool SystemTonePlayerImpl::IsExitCallbackThreadId(int32_t streamId) { - MEDIA_LOGI("Query streamId: %{public}d", streamId); std::lock_guard lock(systemTonePlayerMutex_); return callbackThreadIdMap_.count(streamId) != 0 && callbackThreadIdMap_[streamId] == std::this_thread::get_id(); }