Merge branch 'master' of gitee.com:openharmony/applications_dlp_manager into master

Signed-off-by: 何钱贝 <heqianbei@huawei.com>
This commit is contained in:
何钱贝 2024-10-30 13:02:37 +00:00 committed by Gitee
commit d2cc80008a
2 changed files with 1 additions and 2 deletions

View File

@ -749,7 +749,7 @@ export default class ViewAbility extends ServiceExtensionAbility {
let paramCallerBundleName = want.parameters?.['ohos.aafwk.param.callerBundleName'] as string;
AppStorage.setOrCreate('paramCallerBundleName', paramCallerBundleName);
let pluginId: string = (want.parameters?.['DlpConnectionPluginId'] as DlpConnectionPluginIdObj)?.id;
let pluginId: string = (want.parameters?.['dlpConnectionPluginId'] as DlpConnectionPluginIdObj)?.id;
if (pluginId === null || pluginId === undefined) {
return true;
}

View File

@ -557,7 +557,6 @@ struct encryptedSharing {
.defaultFocus(false)
.direction(SystemUtils.isRTL() ? Direction.Rtl : Direction.Ltr)
.type(InputType.PhoneNumber)
.contentType(ContentType.PHONE_COUNTRY_CODE)
.enterKeyType(EnterKeyType.NEW_LINE)
.border(this.phoneFormatTips ?
{ width: Constants.DIALOG_MD_OFFSET, color: $r('sys.color.ohos_id_color_warning') } : { width: 0 })