From e0055a67e4206203f6be89dd8b13ba5117493d2f Mon Sep 17 00:00:00 2001 From: shilei Date: Fri, 28 Jan 2022 03:53:00 +0000 Subject: [PATCH] remove @StageModelOnly Signed-off-by: shilei Change-Id: Ie45a0e39f7fc8722da217a7cb68766afacf7181b --- api/@ohos.bundle.d.ts | 16 +---------- api/ability/want.d.ts | 2 -- api/bundle/abilityInfo.d.ts | 1 - api/bundle/applicationInfo.d.ts | 1 - api/bundle/bundleInfo.d.ts | 1 - api/bundle/extensionAbilityInfo.d.ts | 15 ----------- api/bundle/hapModuleInfo.d.ts | 1 - api/bundle/metadata.d.ts | 40 +++++++++++++--------------- 8 files changed, 19 insertions(+), 58 deletions(-) diff --git a/api/@ohos.bundle.d.ts b/api/@ohos.bundle.d.ts index 88d5361894..d6e315cf2b 100644 --- a/api/@ohos.bundle.d.ts +++ b/api/@ohos.bundle.d.ts @@ -55,7 +55,6 @@ declare namespace bundle { GET_ABILITY_INFO_WITH_METADATA = 0x00000020, /** * @since 9 - * @StageModelOnly */ GET_BUNDLE_WITH_EXTENSION_ABILITY = 0x00000020, /** @@ -76,14 +75,13 @@ declare namespace bundle { GET_APPLICATION_INFO_WITH_DISABLE = 0x00000200, } - /** +/** * @name ExtensionFlag * @since 9 * @SysCap SystemCapability.Appexecfwk * @import NA * @permission NA * @devices phone, tablet, tv, wearable - * @StageModelOnly */ enum ExtensionFlag { GET_EXTENSION_INFO_DEFAULT = 0x00000000, @@ -239,77 +237,66 @@ declare namespace bundle { * @import NA * @permission NA * @devices phone, tablet, tv, wearable - * @StageModelOnly */ export enum ExtensionAbilityType { /** * @default Indicates extension info with type of form * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ FORM = 0, /** * @default Indicates extension info with type of work schedule * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ WORK_SCHEDULER = 1, /** * @default Indicates extension info with type of input method * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ INPUTMETHOD = 2, /** * @default Indicates extension info with type of service * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ SERVICE = 3, /** * @default Indicates extension info with type of accessibility * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ ACCESSIBILITY = 4, /** * @default Indicates extension info with type of datashare * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ DATASHARE = 5, /** * @default Indicates extension info with type of fileshare * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ FILESHARE = 6, /** * @default Indicates extension info with type of staticsubscriber * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ STATICSUBSCRIBER = 7, /** * @default Indicates extension info with type of wallpaper * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ WALLPAPER = 8, /** * @default Indicates extension info with type of unspecified * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ UNSPECIFIED = 9, } @@ -604,7 +591,6 @@ declare namespace bundle { * @param userId Indicates the user ID. * @return Returns a list of ExtensionInfo objects. * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED, ohos.permission.GET_BUNDLE_INFO - * @StageModelOnly */ function queryExtensionAbilityInfosByWant(want: Want, extensionFlags: number, userId: number, callback: AsyncCallback>): void; function queryExtensionAbilityInfosByWant(want: Want, extensionFlags: number, callback: AsyncCallback>): void; diff --git a/api/ability/want.d.ts b/api/ability/want.d.ts index bd0efc62e5..e34b658e4e 100644 --- a/api/ability/want.d.ts +++ b/api/ability/want.d.ts @@ -109,7 +109,6 @@ export declare interface Want { * @since 9 * @sysCap AAFwk * @default - - * @StageModelOnly */ extensionAbilityName?: string; @@ -119,7 +118,6 @@ export declare interface Want { * @since 9 * @sysCap AAFwk * @default - - * @StageModelOnly */ extensionAbilityType?: number; } \ No newline at end of file diff --git a/api/bundle/abilityInfo.d.ts b/api/bundle/abilityInfo.d.ts index 90842948a8..e0738c988e 100644 --- a/api/bundle/abilityInfo.d.ts +++ b/api/bundle/abilityInfo.d.ts @@ -268,7 +268,6 @@ export interface AbilityInfo { * @default Indicates the metadata of ability * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly * */ readonly metadata: Array; diff --git a/api/bundle/applicationInfo.d.ts b/api/bundle/applicationInfo.d.ts index 9560cf1009..6ded16d32b 100644 --- a/api/bundle/applicationInfo.d.ts +++ b/api/bundle/applicationInfo.d.ts @@ -155,7 +155,6 @@ export interface ApplicationInfo { * @default Indicates the metadata of module * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly metadata: Map>; diff --git a/api/bundle/bundleInfo.d.ts b/api/bundle/bundleInfo.d.ts index e71e1b1117..6c1b2743df 100644 --- a/api/bundle/bundleInfo.d.ts +++ b/api/bundle/bundleInfo.d.ts @@ -247,7 +247,6 @@ export interface BundleInfo { * @default Obtains configuration information about an ability * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly extensionAbilityInfo: Array; } diff --git a/api/bundle/extensionAbilityInfo.d.ts b/api/bundle/extensionAbilityInfo.d.ts index f236de96eb..38422f3bf8 100644 --- a/api/bundle/extensionAbilityInfo.d.ts +++ b/api/bundle/extensionAbilityInfo.d.ts @@ -23,14 +23,12 @@ import bundle from './../@ohos.bundle'; * @SysCap SystemCapability.Appexecfwk * @permission NA * @devices phone, tablet, tv, wearable, car - * @StageModelOnly */ export interface ExtensionAbilityInfo { /** * @default Indicates the name of the bundle * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly bundleName: string; @@ -38,7 +36,6 @@ export interface ExtensionAbilityInfo { * @default Indicates the name of the module * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly moduleName: string; @@ -46,7 +43,6 @@ export interface ExtensionAbilityInfo { * @default Indicates the name of the extension info * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly name: string; @@ -54,7 +50,6 @@ export interface ExtensionAbilityInfo { * @default Indicates the label id of the entension info * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly labelId: number; @@ -62,7 +57,6 @@ export interface ExtensionAbilityInfo { * @default Indicates the description id of the entension info * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly descriptionId: number; @@ -70,7 +64,6 @@ export interface ExtensionAbilityInfo { * @default Indicates the icon id of the entension info * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly iconId: number; @@ -78,7 +71,6 @@ export interface ExtensionAbilityInfo { * @default Indicates whether the entensionInfo can be visible or not * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly isVisible: boolean; @@ -86,7 +78,6 @@ export interface ExtensionAbilityInfo { * @default Enumerates types of the entension info * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly extensionAbilityType: bundle.ExtensionAbilityType; @@ -94,7 +85,6 @@ export interface ExtensionAbilityInfo { * @default The permissions that others need to use this extension info * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly permissions: Array; @@ -102,7 +92,6 @@ export interface ExtensionAbilityInfo { * @default Obtains configuration information about an application * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly applicationInfo: ApplicationInfo; @@ -110,7 +99,6 @@ export interface ExtensionAbilityInfo { * @default Indicates the metadata of bundle * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly metadata: Array; @@ -118,7 +106,6 @@ export interface ExtensionAbilityInfo { * @default Indicates the src language to express extension info * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly enabled: boolean; @@ -126,7 +113,6 @@ export interface ExtensionAbilityInfo { * @default Indicates the read permission extension ability info * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly readPermission: string; @@ -134,7 +120,6 @@ export interface ExtensionAbilityInfo { * @default Indicates the write permission of extension ability info * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly writePermission: string; } diff --git a/api/bundle/hapModuleInfo.d.ts b/api/bundle/hapModuleInfo.d.ts index e845f56734..93bad54878 100644 --- a/api/bundle/hapModuleInfo.d.ts +++ b/api/bundle/hapModuleInfo.d.ts @@ -126,7 +126,6 @@ export interface HapModuleInfo { * @default Obtains configuration information about extension ability * @since 9 * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly */ readonly extensionAbilityInfo: Array; } \ No newline at end of file diff --git a/api/bundle/metadata.d.ts b/api/bundle/metadata.d.ts index 31549fda79..4dc3241aa0 100644 --- a/api/bundle/metadata.d.ts +++ b/api/bundle/metadata.d.ts @@ -14,35 +14,31 @@ */ /** - * @name Indicates the Metadata - * @since 9 - * @SysCap SystemCapability.Appexecfwk - * @permission NA - * @devices phone, tablet, tv, wearable, car - * @StageModelOnly - */ + * @name Indicates the Metadata + * @since 9 + * @SysCap SystemCapability.Appexecfwk + * @permission NA + * @devices phone, tablet, tv, wearable, car + */ export interface Metadata { /** - * @default Indicates the metadata name - * @since 9 - * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly - */ + * @default Indicates the metadata name + * @since 9 + * @SysCap SystemCapability.Appexecfwk + */ name: string; /** - * @default Indicates the metadata value - * @since 9 - * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly - */ + * @default Indicates the metadata value + * @since 9 + * @SysCap SystemCapability.Appexecfwk + */ value: string; /** - * @default Indicates the metadata resource - * @since 9 - * @SysCap SystemCapability.Appexecfwk - * @StageModelOnly - */ + * @default Indicates the metadata resource + * @since 9 + * @SysCap SystemCapability.Appexecfwk + */ resource: string; } \ No newline at end of file -- Gitee