openharmony/filemanagement_storage_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/filemanagement_storage_service synced 2024-11-27 01:01:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!571 broadcast add uuid

Browse Source 
Merge pull request !571 from 张文迪/bc+uuid
This commit is contained in:
openharmony_ci 2023-06-27 12:05:02 +00:00 committed by Gitee
commit 1802fdda8c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/storage_daemon/crypto/src/huks_master.cpp
View File

@ -560,7 +560,7 @@ static bool CheckNeedUpgrade(KeyBlob &inData)
return false;
}
struct HksParam *keyVersion = NULL;
struct HksParam *keyVersion = nullptr;
ret = HksGetParam(keyBlobParamSet, HKS_TAG_KEY_VERSION, &keyVersion);
if (ret != HKS_SUCCESS) {
LOGE("version get key param failed!");

2
services/storage_daemon/file_sharing/test/acl_test.cpp
View File

@ -320,7 +320,7 @@ HWTEST_F(AclTest, acl_serialize_test_2, TestSize.Level1)
Acl acl2;
size_t bias = 1;
rc = acl2.DeSerialize(buf, bufSize + bias);
rc = acl2.DeSerialize(buf, sizeof(AclXattrHeader) + sizeof(AclXattrEntry) * 100 + bias);
EXPECT_TRUE(rc != 0) << "de-serializing with wrong bufSize should fail";
}
}

2
services/storage_manager/volume/src/notification.cpp
View File

@ -36,6 +36,7 @@ void Notification::NotifyVolumeChange(int32_t notifyCode, std::shared_ptr<Volume
AAFwk::WantParams wantParams;
wantParams.SetParam("id", AAFwk::String::Box(volume->GetId()));
wantParams.SetParam("diskId", AAFwk::String::Box(volume->GetDiskId()));
wantParams.SetParam("fsUuid", AAFwk::String::Box(volume->GetUuid()));
switch (notifyCode) {
case VOLUME_REMOVED:
LOGI("notifycode: VOLUME_REMOVED");
@ -49,7 +50,6 @@ void Notification::NotifyVolumeChange(int32_t notifyCode, std::shared_ptr<Volume
case VOLUME_MOUNTED:
LOGI("notifycode: VOLUME_MOUNTED");
wantParams.SetParam("volumeState", AAFwk::Integer::Box(MOUNTED));
wantParams.SetParam("fsUuid", AAFwk::String::Box(volume->GetUuid()));
wantParams.SetParam("path", AAFwk::String::Box(volume->GetPath()));
wantParams.SetParam("fsType", AAFwk::Integer::Box(volume->GetFsType()));
want.SetAction(EventFwk::CommonEventSupport::COMMON_EVENT_VOLUME_MOUNTED);