mirror of
https://gitee.com/openharmony/applications_dlp_manager
synced 2024-11-23 01:49:46 +00:00
Resolve conflicts.
Signed-off-by: 王永忠 <wangyongzhong2@huawei.com>
This commit is contained in:
parent
e0e282c1cc
commit
113440845f
@ -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')) {
|
||||
|
Loading…
Reference in New Issue
Block a user