From 7f5d7a39985490522cb77d2caf13c5d1e308846b Mon Sep 17 00:00:00 2001 From: cc_ggboy Date: Thu, 13 Oct 2022 10:43:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E8=81=94=E6=83=B3-=E6=96=B0?= =?UTF-8?q?=E5=A2=9Eoverload=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cc_ggboy --- api/@ohos.abilityAccessCtrl.d.ts | 22 ++++++++++++---------- api/@ohos.privacyManager.d.ts | 23 ++++++++++++----------- api/permissions.d.ts | 1 + 3 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 api/permissions.d.ts diff --git a/api/@ohos.abilityAccessCtrl.d.ts b/api/@ohos.abilityAccessCtrl.d.ts index 8794cd818f..a8c7a3a08e 100644 --- a/api/@ohos.abilityAccessCtrl.d.ts +++ b/api/@ohos.abilityAccessCtrl.d.ts @@ -14,6 +14,7 @@ */ import { AsyncCallback, Callback } from './basic'; +import { Permissions } from './permissions'; /** * @syscap SystemCapability.Security.AccessToken @@ -41,6 +42,7 @@ import { AsyncCallback, Callback } from './basic'; * @useinstead ohos.abilityAccessCtrl.AtManager#checkAccessToken */ verifyAccessToken(tokenID: number, permissionName: string): Promise; + verifyAccessToken(tokenID: number, permissionName: Permissions): Promise; /** * Checks whether a specified application has been granted the given permission synchronously. @@ -51,7 +53,7 @@ import { AsyncCallback, Callback } from './basic'; * @return Returns permission verify result. * @since 9 */ - verifyAccessTokenSync(tokenID: number, permissionName: string): GrantStatus; + verifyAccessTokenSync(tokenID: number, permissionName: Permissions): GrantStatus; /** * Checks whether a specified application has been granted the given permission. @@ -62,7 +64,7 @@ import { AsyncCallback, Callback } from './basic'; * @return Returns permission verify result. * @since 9 */ - checkAccessToken(tokenID: number, permissionName: string): Promise; + checkAccessToken(tokenID: number, permissionName: Permissions): Promise; /** * Grants a specified user_grant permission to the given application. @@ -81,8 +83,8 @@ import { AsyncCallback, Callback } from './basic'; * @systemapi * @since 8 */ - grantUserGrantedPermission(tokenID: number, permissionName: string, permissionFlag: number): Promise; - grantUserGrantedPermission(tokenID: number, permissionName: string, permissionFlag: number, callback: AsyncCallback): void; + grantUserGrantedPermission(tokenID: number, permissionName: Permissions, permissionFlag: number): Promise; + grantUserGrantedPermission(tokenID: number, permissionName: Permissions, permissionFlag: number, callback: AsyncCallback): void; /** * Revokes a specified user_grant permission to the given application. @@ -101,8 +103,8 @@ import { AsyncCallback, Callback } from './basic'; * @systemapi * @since 8 */ - revokeUserGrantedPermission(tokenID: number, permissionName: string, permissionFlag: number): Promise; - revokeUserGrantedPermission(tokenID: number, permissionName: string, permissionFlag: number, callback: AsyncCallback): void; + revokeUserGrantedPermission(tokenID: number, permissionName: Permissions, permissionFlag: number): Promise; + revokeUserGrantedPermission(tokenID: number, permissionName: Permissions, permissionFlag: number, callback: AsyncCallback): void; /** * Queries specified permission flag of the given application. @@ -120,7 +122,7 @@ import { AsyncCallback, Callback } from './basic'; * @systemapi * @since 8 */ - getPermissionFlags(tokenID: number, permissionName: string): Promise; + getPermissionFlags(tokenID: number, permissionName: Permissions): Promise; /** * Queries permission management version. @@ -158,7 +160,7 @@ import { AsyncCallback, Callback } from './basic'; * @systemapi * @since 9 */ - on(type: 'permissionStateChange', tokenIDList: Array, permissionNameList: Array, callback: Callback): void; + on(type: 'permissionStateChange', tokenIDList: Array, permissionNameList: Array, callback: Callback): void; /** * Unregisters a permission state callback so that the specified applications cannot be notified upon specified permissions state changes anymore. @@ -175,7 +177,7 @@ import { AsyncCallback, Callback } from './basic'; * @systemapi * @since 9 */ - off(type: 'permissionStateChange', tokenIDList: Array, permissionNameList: Array, callback?: Callback): void; + off(type: 'permissionStateChange', tokenIDList: Array, permissionNameList: Array, callback?: Callback): void; } /** @@ -229,7 +231,7 @@ import { AsyncCallback, Callback } from './basic'; /** * Indicates the permission whose state has been changed. */ - permissionName: string; + permissionName: Permissions; } } diff --git a/api/@ohos.privacyManager.d.ts b/api/@ohos.privacyManager.d.ts index eab14d882b..3df5040052 100644 --- a/api/@ohos.privacyManager.d.ts +++ b/api/@ohos.privacyManager.d.ts @@ -14,6 +14,7 @@ */ import {AsyncCallback, Callback} from './basic' +import { Permissions } from './permissions' /** * @syscap SystemCapability.Security.AccessToken @@ -37,8 +38,8 @@ import {AsyncCallback, Callback} from './basic' * @systemapi * @since 9 */ - function addPermissionUsedRecord(tokenID: number, permissionName: string, successCount: number, failCount: number): Promise; - function addPermissionUsedRecord(tokenID: number, permissionName: string, successCount: number, failCount: number, callback: AsyncCallback): void; + function addPermissionUsedRecord(tokenID: number, permissionName: Permissions, successCount: number, failCount: number): Promise; + function addPermissionUsedRecord(tokenID: number, permissionName: Permissions, successCount: number, failCount: number, callback: AsyncCallback): void; /** * Queries the access records of sensitive permission. @@ -75,8 +76,8 @@ import {AsyncCallback, Callback} from './basic' * @systemapi * @since 9 */ - function startUsingPermission(tokenID: number, permissionName: string): Promise; - function startUsingPermission(tokenID: number, permissionName: string, callback: AsyncCallback): void; + function startUsingPermission(tokenID: number, permissionName: Permissions): Promise; + function startUsingPermission(tokenID: number, permissionName: Permissions, callback: AsyncCallback): void; /** * Stop using sensitive permission. @@ -95,8 +96,8 @@ import {AsyncCallback, Callback} from './basic' * @systemapi * @since 9 */ - function stopUsingPermission(tokenID: number, permissionName: string): Promise; - function stopUsingPermission(tokenID: number, permissionName: string, callback: AsyncCallback): void; + function stopUsingPermission(tokenID: number, permissionName: Permissions): Promise; + function stopUsingPermission(tokenID: number, permissionName: Permissions, callback: AsyncCallback): void; /** * Subscribes to the change of active state of the specified permission. @@ -112,7 +113,7 @@ import {AsyncCallback, Callback} from './basic' * @systemapi * @since 9 */ - function on(type: 'activeStateChange', permissionNameList: Array, callback: Callback): void; + function on(type: 'activeStateChange', permissionNameList: Array, callback: Callback): void; /** * Unsubscribes to the change of active state of the specified permission. @@ -127,7 +128,7 @@ import {AsyncCallback, Callback} from './basic' * @systemapi * @since 9 */ - function off(type: 'activeStateChange', permissionNameList: Array, callback?: Callback): void; + function off(type: 'activeStateChange', permissionNameList: Array, callback?: Callback): void; /** * Enum for permission for status. @@ -165,7 +166,7 @@ import {AsyncCallback, Callback} from './basic' /** * The permission name */ - permissionName: string; + permissionName: Permissions; /** * The device id @@ -222,7 +223,7 @@ import {AsyncCallback, Callback} from './basic' /** * The list of permision name */ - permissionNames: Array; + permissionNames: Array; /** * The begin time, in milliseconds @@ -303,7 +304,7 @@ import {AsyncCallback, Callback} from './basic' /** * The permission name */ - permissionName: string; + permissionName: Permissions; /** * The access counts diff --git a/api/permissions.d.ts b/api/permissions.d.ts new file mode 100644 index 0000000000..bd785da289 --- /dev/null +++ b/api/permissions.d.ts @@ -0,0 +1 @@ +export type Permissions = string; \ No newline at end of file -- Gitee