diff --git a/common/include/dscreen_errcode.h b/common/include/dscreen_errcode.h index c51528f81923c1862b94bbb11cf893280563ad28..f2de0565e48b4ff9c4ed83f7ed201e964b8023ff 100644 --- a/common/include/dscreen_errcode.h +++ b/common/include/dscreen_errcode.h @@ -62,6 +62,7 @@ enum DScreenErrorCode { ERR_DH_SCREEN_SA_DSCREEN_SETUP_FAILED = -500036, ERR_DH_SCREEN_SA_SET_IMAGESURFACE_FAIL = -500037, ERR_DH_SCREEN_SA_INIT_SOURCE_FAIL = -500038, + ERR_DH_SCREEN_SA_CHECK_ENABLE_PERMISSION_FAIL = -500039, // Transport component error code ERR_DH_SCREEN_TRANS_ERROR = -51000, ERR_DH_SCREEN_TRANS_TIMEOUT = -51001, diff --git a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_stub.cpp b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_stub.cpp index 0df80cb3805185e18cb31c0b8fa09eb1ec939b2f..d71c57f4ba52f7b16efcc4df60a9f4d2ded02b62 100644 --- a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_stub.cpp +++ b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_stub.cpp @@ -72,7 +72,7 @@ int32_t DScreenSinkStub::InitSinkInner(MessageParcel &data, MessageParcel &reply (void)option; if (!HasEnableDHPermission()) { DHLOGE("The caller has no ENABLE_DISTRIBUTED_HARDWARE permission."); - return DSCREEN_INIT_ERR; + return ERR_DH_SCREEN_SA_CHECK_ENABLE_PERMISSION_FAIL; } std::string param = data.ReadString(); if (param.empty() || param.size() > PARAM_MAX_SIZE) { diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp index d3dd81955801a48201dc5e51b9121147f68950c2..d4702fed89713dbd7661289e20e5c3b1710e54c9 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp @@ -335,7 +335,7 @@ void DScreen::ConsumeSurface() } int32_t retcode = syncFence_->Wait(SURFACE_SYNC_FENCE_TIMEOUT); if (retcode == -ETIME) { - DHLOGE("Sync fence wait timeout, retcode is %." PRId32, retcode); + DHLOGE("Sync fence wait timeout, retcode is %" PRId32, retcode); consumerSurface_->ReleaseBuffer(surfaceBuffer, -1); return; } diff --git a/services/screentransport/screendatachannel/src/screen_data_channel_impl.cpp b/services/screentransport/screendatachannel/src/screen_data_channel_impl.cpp index f7f666017f75b530c12980e3f7cb30d1e314817d..d665c1c953c73c80ae388c2784b2f620fff4fbfc 100644 --- a/services/screentransport/screendatachannel/src/screen_data_channel_impl.cpp +++ b/services/screentransport/screendatachannel/src/screen_data_channel_impl.cpp @@ -374,7 +374,7 @@ void ScreenDataChannelImpl::JsonToDirtyJson(nlohmann::json &rectJson, std::share if (!IsInt32(rectJson[item], KEY_POINT_DIRTY_X) || !IsInt32(rectJson[item], KEY_POINT_DIRTY_Y) || !IsInt32(rectJson[item], KEY_POINT_DIRTY_W) || !IsInt32(rectJson[item], KEY_POINT_DIRTY_H) || !IsInt32(rectJson[item], KEY_POINT_DIRTY_SIZE)) { - DHLOGE("%s: JsonToDirtyJson rectJson not contain int32.", LOG_TAG); + DHLOGE("%s: JsonToDirtyJson rectJson not contain int32", LOG_TAG); return; } int32_t X = rectJson[item][KEY_POINT_DIRTY_X].get();