diff --git a/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetAbility.ets b/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetAbility.ets index 4b07c1f4f44b0e52f63444f37a07640399a29938..dd71c78c0f607638b0b76ec3e37d6f7104859f6e 100644 --- a/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetAbility.ets +++ b/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetAbility.ets @@ -156,10 +156,14 @@ export default class GlobalSwitchSheetAbility extends UIExtensionAbility { return; } } - let dis = display.getDefaultDisplaySync(); - await this.subWindowForHost?.resize(dis.width, dis.height).catch((err: BusinessError) => { - Log.error('resize window error: ' + err.code + ' ' + err.message); - }); + try { + let dis = display.getDefaultDisplaySync(); + await this.subWindowForHost?.resize(dis.width, dis.height).catch((err: BusinessError) => { + Log.error('resize window error: ' + err.code + ' ' + err.message); + }); + } catch (error) { + Log.error('getDefaultDisplaySync error: ' + error.code + ' ' + error.message); + } this.subWindowForHost?.on('windowEvent', (eventType: window.WindowEventType) => { Log.info('window event type is: ' + eventType); storage.setOrCreate('permissionWindow', eventType); diff --git a/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetAbility.ets b/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetAbility.ets index 687798b2dd1b56bc1dbe79df6761199ca6c6eeaa..4f6f1729b59b1d68d99d916e3793eeaad92c45b2 100644 --- a/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetAbility.ets +++ b/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetAbility.ets @@ -156,10 +156,14 @@ export default class PermissionStateSheetAbility extends UIExtensionAbility { return; } } - let dis = display.getDefaultDisplaySync(); - await this.subWindowForHost?.resize(dis.width, dis.height).catch((err: BusinessError) => { - Log.error('resize window error: ' + err.code + ' ' + err.message); - }); + try { + let dis = display.getDefaultDisplaySync(); + await this.subWindowForHost?.resize(dis.width, dis.height).catch((err: BusinessError) => { + Log.error('resize window error: ' + err.code + ' ' + err.message); + }); + } catch (error) { + Log.error('getDefaultDisplaySync error: ' + error.code + ' ' + error.message); + } this.subWindowForHost?.on('windowEvent', (eventType: window.WindowEventType) => { Log.info('window event type is: ' + eventType); storage.setOrCreate('permissionWindow', eventType); diff --git a/permissionmanager/src/main/ets/pages/authority-management.ets b/permissionmanager/src/main/ets/pages/authority-management.ets index ca6fb6cad55494413f2269b084a50f4ed8558367..d092b90299261d1eced0244dbdd0145b09e36661 100644 --- a/permissionmanager/src/main/ets/pages/authority-management.ets +++ b/permissionmanager/src/main/ets/pages/authority-management.ets @@ -383,9 +383,13 @@ struct authorityManagementPage { */ aboutToAppear() { this.getAllBundlePermissions(); - let dis = display.getDefaultDisplaySync(); - this.isVertical = dis.height > dis.width ? true : false; - GlobalContext.store('isVertical', dis.height > dis.width ? true : false); + try { + let dis = display.getDefaultDisplaySync(); + this.isVertical = dis.height > dis.width ? true : false; + GlobalContext.store('isVertical', dis.height > dis.width ? true : false); + } catch (error) { + Log.error(`getDefaultDisplaySync failed. ${JSON.stringify(error)}`); + } } getPermissionGroup(allGroup: GroupPermission[], order: number): GroupPermission[] { diff --git a/permissionmanager/src/main/ets/pages/dialogPlus.ets b/permissionmanager/src/main/ets/pages/dialogPlus.ets index d03003fb439eeed8e69060c9275ef08d1da60ec1..027c2f1223953c1313a465f5fe16337a12ce13e2 100644 --- a/permissionmanager/src/main/ets/pages/dialogPlus.ets +++ b/permissionmanager/src/main/ets/pages/dialogPlus.ets @@ -362,7 +362,7 @@ struct dialogPlusPage { this.initStatus = Constants.INIT_NEED_TO_TERMINATED; return; } - Log.info('request permission=' + JSON.stringify(this.reqPerms) + ', tokenId = ' + this.accessTokenId); + Log.info(`request permission: ${JSON.stringify(this.reqPerms)}.`); Log.info('permission state=' + JSON.stringify(this.want.parameters['ohos.user.grant.permission.state'])); this.result = new Array(this.reqPerms.length).fill(-1); this.getPasteBoardInfo();