!188 L1设备卸载应用,storage/app/data目录下仍存在已卸载应用的目录

Merge pull request !188 from shilei91/cherry-pick-1658977419
This commit is contained in:
openharmony_ci
2022-07-28 07:52:11 +00:00
committed by Gitee
2 changed files with 8 additions and 3 deletions
@@ -41,7 +41,7 @@ public:
int32_t MoveFile(const char *oldFile, const char *newFile);
int32_t RemoveFile(const char *file);
int32_t RemoveInstallDirectory(const char *codePath, const char *dataPath, bool keepData);
int32_t CallClientInvoke(int32_t funcId, const char *firstPath, const char *secondPath);
int32_t CallClientInvoke(int32_t funcId, const char *firstPath, const char *secondPath, bool keepData = false);
static int32_t BundleDaemonCallback(uint32_t code, IpcIo* data, IpcIo* reply, MessageOption option);
static void DeathCallback(void* arg);
static int Notify(IOwner owner, int code, IpcIo *reply);
@@ -204,7 +204,8 @@ int32_t BundleDaemonClient::RegisterCallback()
return WaitResultSync(EC_SUCCESS);
}
int32_t BundleDaemonClient::CallClientInvoke(int32_t funcId, const char *firstPath, const char *secondPath)
int32_t BundleDaemonClient::CallClientInvoke(int32_t funcId, const char *firstPath, const char *secondPath,
bool keepData)
{
IpcIo request;
char data[MAX_IO_SIZE];
@@ -215,6 +216,10 @@ int32_t BundleDaemonClient::CallClientInvoke(int32_t funcId, const char *firstPa
WriteUint16(&request, strlen(firstPath));
if (funcId == REMOVE_INSTALL_DIRECTORY) {
WriteBool(&request, keepData);
}
Lock<Mutex> lock(mutex_);
#ifdef __LINUX__
return WaitResultSync(bdsClient_->Invoke(bdsClient_, funcId, &request, this, Notify));
@@ -366,6 +371,6 @@ int32_t BundleDaemonClient::RemoveInstallDirectory(const char *codePath, const c
return EC_INVALID;
}
return CallClientInvoke(REMOVE_INSTALL_DIRECTORY, codePath, dataPath);
return CallClientInvoke(REMOVE_INSTALL_DIRECTORY, codePath, dataPath, keepData);
}
} // OHOS