openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 12:43:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

!19705 merge sync-storage-manager-idl into master

Browse Source 
fix: remove deleted interfaces from IStorageManager.idl in mock files

Created-by: zhonglufu
Commit-by: zhonglufu
Merged-by: openharmony_ci
Description: Remove Volume/Disk/Partition/Encrypt related interfaces that were deleted from IStorageManager.idl in two mock header files:
- test/new_test/mock/upms/uri_permission_mgr/include/istorage_manager.h
- test/unittest/uri_permission_impl_test/mock/include/mock_storage_manager_service.h

Deleted interfaces (35 total):
Volume/Disk: NotifyVolumeCreated, NotifyVolumeMounted, NotifyVolumeStateChanged, NotifyVolumeDamaged, Mount, Unmount, TryToFix, GetAllVolumes, GetVolumeByUuid, GetVolumeById, SetVolumeDescription, Format, NotifyDiskCreated, NotifyDiskDestroyed, GetAllDisks, GetDiskById, Partition, NotifyMtpMounted, NotifyMtpUnmounted, QueryUsbIsInUse
Disk crypt: Encrypt, Decrypt, Unlock, GetCryptProgressById, GetCryptUuidById, BindRecoverKeyToPasswd, UpdateCryptPasswd, ResetCryptPasswd, VerifyCryptPasswd, NotifyEncryptVolumeStateChanged
Partition: GetPartitionTable, CreatePartition, DeletePartition, FormatPartition
Other: IsUsbFuseByType

Relates: https://gitcode.com/openharmony/customization_enterprise_device_management/issues/1531

See merge request: openharmony/ability_ability_runtime!19705
This commit is contained in:
openharmony_ci
2026-06-29 10:11:46 +08:00
parent 143f8bfc8f 3a1c02eca4
commit f709077bc5
2 changed files with 0 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/new_test/mock/upms/uri_permission_mgr/include/istorage_manager.h
-104
View File
@@ -52,17 +52,6 @@ public:
return 0;
}
virtual int32_t NotifyMtpMounted(const std::string &id, const std::string &path,
const std::string &desc, const std::string &uuid) override
{
return 0;
}
virtual int32_t NotifyMtpUnmounted(const std::string &id, const std::string &path, const bool isBadRemove) override
{
return 0;
}
virtual int32_t GetFreeSizeOfVolume(const std::string &volumeUuid, int64_t &freeSize) override
{
return 0;
@@ -115,99 +104,6 @@ public:
return 0;
}
virtual int32_t NotifyVolumeCreated(const VolumeCore& vc) override
{
return 0;
}
virtual int32_t NotifyVolumeMounted(const std::string &volumeId, const std::string &fsTypeStr,
const std::string &fsUuid, const std::string &path, const std::string &description) override
{
return 0;
}
virtual int32_t NotifyVolumeDamaged(const std::string &volumeId,
const std::string &fsTypeStr, const std::string &fsUuid,
const std::string &path, const std::string &description) override
{
return 0;
}
virtual int32_t NotifyVolumeStateChanged(const std::string &volumeId, uint32_t state) override
{
return 0;
}
virtual int32_t Mount(const std::string &volumeId) override
{
return 0;
}
virtual int32_t Unmount(const std::string &volumeId) override
{
return 0;
}
virtual int32_t TryToFix(const std::string &volumeId) override
{
return 0;
}
virtual int32_t GetAllVolumes(std::vector<VolumeExternal> &vecOfVol) override
{
return 0;
}
virtual int32_t NotifyDiskCreated(const Disk& disk) override
{
return 0;
}
virtual int32_t NotifyDiskDestroyed(const std::string &diskId) override
{
return 0;
}
virtual int32_t Partition(const std::string &diskId, int32_t type) override
{
return 0;
}
virtual int32_t GetAllDisks(std::vector<Disk> &vecOfDisk) override
{
return 0;
}
virtual int32_t GetVolumeByUuid(const std::string &fsUuid, VolumeExternal &vc) override
{
return 0;
}
virtual int32_t GetVolumeById(const std::string &volumeId, VolumeExternal &vc) override
{
return 0;
}
virtual int32_t SetVolumeDescription(const std::string &fsUuid, const std::string &description) override
{
return 0;
}
virtual int32_t Format(const std::string &volumeId, const std::string &fsType) override
{
return 0;
}
virtual int32_t GetDiskById(const std::string &diskId, Disk &disk) override
{
return 0;
}
virtual int32_t QueryUsbIsInUse(const std::string &diskPath, bool &isInUse)
{
return 0;
}
virtual int32_t DeleteUserKeys(uint32_t userId) override
{
return 0;
test/unittest/uri_permission_impl_test/mock/include/mock_storage_manager_service.h
-182
View File
@@ -61,22 +61,6 @@ public:
return E_OK;
}
virtual int32_t NotifyMtpMounted(const std::string &id, const std::string &path,
const std::string &desc, const std::string &uuid, const std::string &fstype) override
{
return E_OK;
}
virtual int32_t NotifyMtpUnmounted(const std::string &id, const bool isBadRemove) override
{
return E_OK;
}
virtual int32_t IsUsbFuseByType(const std::string &fsType, bool &enabled) override
{
return E_OK;
}
virtual int32_t GetFreeSizeOfVolume(const std::string &volumeUuid, int64_t &freeSize) override
{
return E_OK;
@@ -149,96 +133,6 @@ public:
return E_OK;
}
virtual int32_t NotifyVolumeCreated(const VolumeCore& vc) override
{
return E_OK;
}
virtual int32_t NotifyVolumeMounted(const VolumeInfoStr &volumeInfoStr) override
{
return E_OK;
}
virtual int32_t NotifyVolumeDamaged(const VolumeInfoStr &volumeInfoStr) override
{
return E_OK;
}
virtual int32_t NotifyVolumeStateChanged(const std::string &volumeId, uint32_t state) override
{
return E_OK;
}
virtual int32_t Mount(const std::string &volumeId) override
{
return E_OK;
}
virtual int32_t Unmount(const std::string &volumeId) override
{
return E_OK;
}
virtual int32_t TryToFix(const std::string &volumeId) override
{
return E_OK;
}
virtual int32_t GetAllVolumes(std::vector<VolumeExternal> &vecOfVol) override
{
return E_OK;
}
virtual int32_t NotifyDiskCreated(const Disk& disk) override
{
return E_OK;
}
virtual int32_t NotifyDiskDestroyed(const std::string &diskId) override
{
return E_OK;
}
virtual int32_t Partition(const std::string &diskId, int32_t type) override
{
return E_OK;
}
virtual int32_t GetAllDisks(std::vector<Disk> &vecOfDisk) override
{
return E_OK;
}
virtual int32_t GetVolumeByUuid(const std::string &fsUuid, VolumeExternal &vc) override
{
return E_OK;
}
virtual int32_t GetVolumeById(const std::string &volumeId, VolumeExternal &vc) override
{
return E_OK;
}
virtual int32_t SetVolumeDescription(const std::string &fsUuid, const std::string &description) override
{
return E_OK;
}
virtual int32_t Format(const std::string &volumeId, const std::string &fsType) override
{
return E_OK;
}
virtual int32_t GetDiskById(const std::string &diskId, Disk &disk) override
{
return E_OK;
}
virtual int32_t QueryUsbIsInUse(const std::string &diskPath, bool &isInUse)
{
return E_OK;
}
virtual int32_t UpdateUserAuth(uint32_t userId, uint64_t secureUid,
const std::vector<uint8_t> &token,
const std::vector<uint8_t> &oldSecret,
@@ -484,82 +378,6 @@ public:
{
return E_OK;
}
virtual int32_t Encrypt(const std::string &volumeId, const std::string &password) override
{
return E_OK;
}
virtual int32_t GetCryptProgressById(const std::string &volumeId, int32_t &progress) override
{
return E_OK;
}
virtual int32_t NotifyEncryptVolumeStateChanged(const VolumeInfoStr &volumeInfoStr) override
{
return E_OK;
}
virtual int32_t GetCryptUuidById(const std::string &volumeId, std::string &uuid) override
{
return E_OK;
}
virtual int32_t BindRecoverKeyToPasswd(const std::string &volumeId,
const std::string &pazzword,
const std::string &recoverKey) override
{
return E_OK;
}
virtual int32_t UpdateCryptPasswd(const std::string &volumeId,
const std::string &pazzword,
const std::string &newPazzword) override
{
return E_OK;
}
virtual int32_t ResetCryptPasswd(const std::string &volumeId,
const std::string &recoverKey,
const std::string &newPazzword) override
{
return E_OK;
}
virtual int32_t VerifyCryptPasswd(const std::string &volumeId, const std::string &pazzword) override
{
return E_OK;
}
virtual int32_t Unlock(const std::string &volumeId, const std::string &pazzword) override
{
return E_OK;
}
virtual int32_t Decrypt(const std::string &volumeId, const std::string &pazzword) override
{
return E_OK;
}
virtual int32_t GetPartitionTable(const std::string &diskId, PartitionTableInfo &partitionTableInfo)
{
return E_OK;
}
int32_t CreatePartition(const std::string &diskId, const PartitionParams &partitionParams)
{
return E_OK;
}
int32_t DeletePartition(const std::string &diskId, uint32_t partitionNum)
{
return E_OK;
}
int32_t FormatPartition(const std::string &diskId, uint32_t partitionNum, const FormatParams &formatParams)
{
return E_OK;
}
};
bool StorageManagerServiceMock::isZero = true;