Resolve conflicts.

Signed-off-by: 王永忠 <wangyongzhong2@huawei.com>
This commit is contained in:
王永忠 2024-11-11 02:12:17 +00:00 committed by Gitee
parent e0e282c1cc
commit 113440845f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -76,6 +76,7 @@ export default class ViewAbility extends ServiceExtensionAbility {
private dlpFile: dlpPermission.DLPFile = defaultDlpFile;
private authPerm: dlpPermission.DLPFileAccess = dlpPermission.DLPFileAccess.READ_ONLY;
private needCallAccount: boolean = true;
private needCheckAccountType: boolean = false;
private sandboxBundleName: string = '';
private sandboxAbilityName: string = '';
private sandboxModuleName: string = '';
@ -782,6 +783,9 @@ export default class ViewAbility extends ServiceExtensionAbility {
this.sandboxBundleName = want.parameters?.['ohos.dlp.params.bundleName'] as string;
this.sandboxAbilityName = want.parameters?.['ohos.dlp.params.abilityName'] as string;
this.sandboxModuleName = want.parameters?.['ohos.dlp.params.moduleName'] as string;
if (this.needCheckAccountType) {
this.needCallAccount = await this.checkNeedCallAccount();
}
if (this.fileName === undefined || this.dlpFd === undefined || this.uri === undefined ||
this.sandboxBundleName === undefined || this.sandboxAbilityName === undefined ||
this.sandboxModuleName === undefined || !this.uri.endsWith('.dlp')) {