diff --git a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets index c1bf2f1055d6e34198a94a21f847702286c8b009..6aeba24672e99c7df63d5c03f3b1053de51027bf 100644 --- a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets +++ b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets @@ -314,8 +314,7 @@ export default namespace abilityAccessCtrl { let p1 = taskpool.execute((): void => { new AtManagerInner().grantUserGrantedPermissionExecute(tokenID, permissionName, permissionFlags);}); p1.then(() => { - let err = new BusinessError(); - callback(err, undefined); + callback(null, undefined); }, (err: Error): void => { callback(err as BusinessError, undefined); }); @@ -355,8 +354,7 @@ export default namespace abilityAccessCtrl { new AtManagerInner().revokeUserGrantedPermissionExecute(tokenID, permissionName, permissionFlags); }); job.then(() => { - let err = new BusinessError(); - callback(err, undefined); + callback(null, undefined); }, (err: Error): void=> { callback(err as BusinessError, undefined); }); diff --git a/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp b/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp index 1d73ec51d3f4dfbfade2bdd75a7f3709aa3357a3..08dd8ab38e65e3834dd6bbd0f93a13c2621f4972 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp @@ -841,6 +841,8 @@ void InitAbilityCtrlFunction(ani_env *env) nullptr, reinterpret_cast(RequestPermissionsFromUserExecute) }, ani_native_function { "requestPermissionOnSettingExecute", nullptr, reinterpret_cast(RequestPermissionOnSettingExecute) }, + ani_native_function {"requestGlobalSwitchExecute", + nullptr, reinterpret_cast(RequestGlobalSwitchExecute) }, ani_native_function { "grantUserGrantedPermissionExecute", nullptr, reinterpret_cast(GrantUserGrantedPermissionExecute) }, ani_native_function { "revokeUserGrantedPermissionExecute", @@ -883,4 +885,4 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) } } // namespace AccessToken } // namespace Security -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets b/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets index a82c0210d9106cc557420726caf3dd59d8177ec4..edbe97fea60fb637478ecf2b3ecf0e65468c827c 100644 --- a/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets +++ b/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets @@ -80,8 +80,7 @@ export default namespace privacyManager { successCount, failCount, options); }); p.then(() => { - let err = new BusinessError(); - callback(err, undefined); + callback(null, undefined); },(err: Error): void=> { callback(err as BusinessError, undefined); }); @@ -117,8 +116,7 @@ export default namespace privacyManager { let p = taskpool.execute((): void => { return stopUsingPermissionExecute(tokenID, permissionName, -1) }); p.then(() => { - let err = new BusinessError(); - callback(err, undefined); + callback(null, undefined); },(err: Error): void=> { callback(err as BusinessError, undefined); }); @@ -176,8 +174,7 @@ export default namespace privacyManager { return startUsingPermissionExecute(tokenID, permissionName, -1, PermissionUsedType.NORMAL_TYPE) }); p.then(() => { - let err = new BusinessError(); - callback(err, undefined); + callback(null, undefined); },(err: Error): void => { callback(err as BusinessError, undefined); }) @@ -226,11 +223,9 @@ export default namespace privacyManager { return getPermissionUsedRecordExecute(request); }); p1.then((ret: NullishType): void => { - let err = new BusinessError(); - callback(err, ret as PermissionUsedResponse); + callback(null, ret as PermissionUsedResponse); }).catch((err: Error): void => { - let response: PermissionUsedResponse = {}; - callback(err as BusinessError, response); + callback(err as BusinessError, undefined); }) }