From f08c0581cc58407e2d84e3dc3186b9b7a3238bea Mon Sep 17 00:00:00 2001 From: chengxingzhen Date: Wed, 4 Jan 2023 20:16:37 +0800 Subject: [PATCH] =?UTF-8?q?xts-requestPermissionsFromUser=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=B8=8B=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chengxingzhen --- .../src/main/ets/test/VerificationTest.ets | 59 ------------------- .../main/ets/MainAbility10/MainAbility10.ts | 16 ----- .../entry/src/main/ets/pages/index.ets | 6 -- .../entry/src/main/ets/pages/index.ets | 7 --- .../entry/src/main/ets/pages/index.ets | 7 --- .../entry/src/main/ets/pages/index.ets | 6 -- 6 files changed, 101 deletions(-) diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/VerificationTest.ets b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/VerificationTest.ets index 722516ad8..34528550a 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/VerificationTest.ets +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/VerificationTest.ets @@ -430,64 +430,5 @@ export default function verificationTest(){ done(); } }) - - /* - * @tc.number SUB_AA_OpenHarmony_RequestPermissionsFromUser_0200 - * @tc.name Stage model is not configured with permission for authorization verification. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_OpenHarmony_RequestPermissionsFromUser_0200', 0, async function(done) { - TAG = 'SUB_AA_OpenHarmony_RequestPermissionsFromUser_0200 ==>'; - - try { - let permissionRequestResult = null - let subscriber = null - let subscribeInfo = { - events: ["Stage_MainAbility10_onCreate", "Stage_MainAbility10_onDestroy"] - } - - function SubscribeInfoCallback(err, data) { - console.info(TAG + "===SubscribeInfoCallback===" + JSON.stringify(data)) - if (data.event == "Stage_MainAbility10_onCreate") { - permissionRequestResult = data.parameters.permissionRequestResult - } - if (data.event == "Stage_MainAbility10_onDestroy") { - console.info(TAG + "===PermissionRequestResult===" + JSON.stringify(permissionRequestResult)) - expect(JSON.stringify(permissionRequestResult.permissions)) - .assertEqual(JSON.stringify(["ohos.permission.CAMERA"])); - expect(JSON.stringify(permissionRequestResult.authResults)).assertEqual(JSON.stringify([2])); - commonEvent.unsubscribe(subscriber, UnSubscribeInfoCallback) - } - } - - function UnSubscribeInfoCallback(err, data) { - console.info(TAG + "===UnSubscribeInfoCallback===") - done() - } - - commonEvent.createSubscriber(subscribeInfo, (err, data) => { - console.info(TAG + "===CreateSubscriberCallback===") - subscriber = data - commonEvent.subscribe(subscriber, SubscribeInfoCallback) - }) - - let wantNum = { - bundleName: 'ohos.acts.aafwk.test.stagesupplement', - abilityName: 'MainAbility10' - } - globalThis.abilityContext.startAbility(wantNum).then((data) => { - console.info(TAG + "startAbility data = " + JSON.stringify(data)); - }).catch((err) => { - console.info(TAG + "startAbility err = " + JSON.stringify(err)); - expect().assertFail(); - done(); - }); - } catch (err) { - console.info(TAG + "catch err = " + JSON.stringify(err)); - expect().assertFail(); - done(); - } - }) }) } diff --git a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility10/MainAbility10.ts b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility10/MainAbility10.ts index a1ce6ac23..8279df460 100644 --- a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility10/MainAbility10.ts +++ b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility10/MainAbility10.ts @@ -7,22 +7,6 @@ export default class MainAbility10 extends Ability { onCreate(want, launchParam) { console.info(printLog10 + "onCreate") - let list = ["ohos.permission.CAMERA"] - this.context.requestPermissionsFromUser(list).then((permissionRequestResult) => { - console.info(printLog10 + "requestPermissionsFromUser data = " + JSON.stringify(permissionRequestResult)); - - var CommonEventPublishData = { - parameters: { - permissionRequestResult: permissionRequestResult - } - } - commonEvent.publish(listPush10 + "onCreate", CommonEventPublishData, (err) => { - console.info(printLog10 + listPush10 + "onCreate"); - }); - }).catch((err) => { - console.info(printLog10 + "requestPermissionsFromUser err = " + JSON.stringify(err)); - }); - setTimeout(()=>{ this.context.terminateSelf().then((data) => { console.info(printLog10 + "terminateSelf data = " + JSON.stringify(data)); diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/pages/index.ets index 5a73d79a4..a7f2e9f28 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/pages/index.ets @@ -65,12 +65,6 @@ struct Index { console.info('fAStartAbilityForResultPromise terminateSelfWithResult END'); } - async aboutToAppear() { - var permissions = ["ohos.permission.DISTRIBUTED_DATASYNC"]; - globalThis.abilityContext.getContext().requestPermissionsFromUser(permissions, 0, (data) => { - console.info("start requestPermissionsFromUser!!!!") - }) - } } async function routePage(page) { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/pages/index.ets index 8414560d7..e4d865476 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/pages/index.ets @@ -101,13 +101,6 @@ struct Index { console.info(tag + ' startAbility fAStartAbilityPromise END'); } - async aboutToAppear() { - var permissions = ["ohos.permission.DISTRIBUTED_DATASYNC"]; - globalThis.abilityContext.getContext().requestPermissionsFromUser(permissions, 0, (data) => { - console.info("start requestPermissionsFromUser!!!!") - }) - } - async terminateSelfWithResult() { console.info('fAStartAbilityForResultPromise terminateSelfWithResult START'); await globalThis.abilityContext.terminateSelfWithResult( diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/pages/index.ets index 8414560d7..e4d865476 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/pages/index.ets @@ -101,13 +101,6 @@ struct Index { console.info(tag + ' startAbility fAStartAbilityPromise END'); } - async aboutToAppear() { - var permissions = ["ohos.permission.DISTRIBUTED_DATASYNC"]; - globalThis.abilityContext.getContext().requestPermissionsFromUser(permissions, 0, (data) => { - console.info("start requestPermissionsFromUser!!!!") - }) - } - async terminateSelfWithResult() { console.info('fAStartAbilityForResultPromise terminateSelfWithResult START'); await globalThis.abilityContext.terminateSelfWithResult( diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/pages/index.ets index d2eddd722..f078d8476 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/pages/index.ets @@ -30,10 +30,4 @@ struct Index { .height('100%') } - async aboutToAppear() { - var permissions = ["ohos.permission.DISTRIBUTED_DATASYNC"]; - globalThis.abilityContext.getContext().requestPermissionsFromUser(permissions, 0, (data) => { - console.info("start requestPermissionsFromUser!!!!") - }) - } } \ No newline at end of file -- GitLab