diff --git a/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetAbility.ets b/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetAbility.ets index d310c135d422e4b2c952968f121f2374f589fc26..79bd6cc8f7bac6d1f09495071fbaae14913f89ec 100644 --- a/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetAbility.ets +++ b/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetAbility.ets @@ -22,6 +22,7 @@ import display from '@ohos.display'; import { BusinessError } from '@ohos.base'; import Constants from '../common/utils/constant'; import AbilityConstant from '@ohos.app.ability.AbilityConstant'; +import deviceInfo from '@ohos.deviceInfo'; let terminating: boolean = false; let state: boolean = false; @@ -32,6 +33,11 @@ export default class GlobalSwitchSheetAbility extends UIExtensionAbility { onCreate(launchParam: AbilityConstant.LaunchParam): void { Log.info('GlobalSwitchSheetAbility on create'); + if (deviceInfo.deviceType === 'wearable') { + this.context.terminateSelf(); + Log.info('GlobalSwitchSheetAbility terminateSelf'); + return; + } } onSessionCreate(want: Want, session: UIExtensionContentSession): void { diff --git a/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetAbility.ets b/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetAbility.ets index 0e794e99f032e185270028720329ed06756fb668..2eb727e805d1d1f2fe29451693f95d44b90bebcf 100644 --- a/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetAbility.ets +++ b/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetAbility.ets @@ -22,6 +22,7 @@ import display from '@ohos.display'; import { BusinessError } from '@ohos.base'; import Constants from '../common/utils/constant'; import AbilityConstant from '@ohos.app.ability.AbilityConstant'; +import deviceInfo from '@ohos.deviceInfo'; let terminating: boolean = false; let state: boolean = false; @@ -32,6 +33,11 @@ export default class PermissionStateSheetAbility extends UIExtensionAbility { onCreate(launchParam: AbilityConstant.LaunchParam): void { Log.info('PermissionStateSheetAbility on create'); + if (deviceInfo.deviceType === 'wearable') { + this.context.terminateSelf(); + Log.info('PermissionStateSheetAbility terminateSelf'); + return; + } } onSessionCreate(want: Want, session: UIExtensionContentSession): void { diff --git a/permissionmanager/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/permissionmanager/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 3f9ea1066d38737b0e2e92458fa4fe28c886bfae..7493a617909b10c0d7e4bf1c9248ed24c5884dad 100644 --- a/permissionmanager/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/permissionmanager/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -19,6 +19,7 @@ import display from '@ohos.display'; import rpc from '@ohos.rpc'; import { GlobalContext } from '../common/utils/globalContext'; import dialogRequest from '@ohos.app.ability.dialogRequest'; +import deviceInfo from '@ohos.deviceInfo'; const TAG = 'PermissionManager_Log: '; const BG_COLOR = '#00000000'; @@ -42,6 +43,11 @@ export default class ServiceExtensionAbility extends extension { onRequest(want, startId): void { console.info(TAG + 'ServiceExtensionAbility onRequest. start id is ' + startId); console.info(TAG + 'want: ' + JSON.stringify(want)); + if (deviceInfo.deviceType === 'wearable') { + this.context.terminateSelf(); + console.info(TAG + 'ServiceExtensionAbility terminateSelf'); + return; + } try { let dis = display.getDefaultDisplaySync();