!2020 Fix appaccount permission and osaccount json

Merge pull request !2020 from 高曦/master_xts_0222

account/appaccount/actsaccounttest/entry/src/main/config.json

@@ -24,6 +24,28 @@
       "moduleName": "entry",
       "moduleType": "entry"
     },
+    "reqPermissions": [
+      {
+        "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
+        "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
+      },
+      {
+        "name":"ohos.permission.GET_BUNDLE_INFO",
+        "reason":"need use ohos.permission.GET_BUNDLE_INFO"
+      },
+      {
+        "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE",
+        "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE"
+      },
+      {
+        "name":"ohos.permission.REMOVE_CACHE_FILES",
+        "reason":"need use ohos.permission.REMOVE_CACHE_FILES"
+      },
+      {
+        "name":"ohos.permission.LISTEN_BUNDLE_CHANGE",
+        "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE"
+      }
+    ],
     "abilities": [
       {
         "skills": [

account/appaccount/actsgetallaccounts/entry/src/main/config.json

@@ -35,6 +35,26 @@
       {
         "name": "ohos.permission.GET_ACCOUNTS_PRIVILEGED",
         "reason": "ceshi"
+      },
+      {
+        "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
+        "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
+      },
+      {
+        "name":"ohos.permission.GET_BUNDLE_INFO",
+        "reason":"need use ohos.permission.GET_BUNDLE_INFO"
+      },
+      {
+        "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE",
+        "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE"
+      },
+      {
+        "name":"ohos.permission.REMOVE_CACHE_FILES",
+        "reason":"need use ohos.permission.REMOVE_CACHE_FILES"
+      },
+      {
+        "name":"ohos.permission.LISTEN_BUNDLE_CHANGE",
+        "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE"
       }
     ],
     "abilities": [

account/appaccount/actssetchecksyncenable/entry/src/main/config.json

@@ -27,14 +27,38 @@
     "defPermissions": [
       {
         "availableScope": [],
-        "grantMode": "system_grant",
+        "grantMode": "user_grant",
         "name": "ohos.permission.DISTRIBUTED_DATASYNC"
       }
     ],
     "reqPermissions": [
+      {
+        "name": "ohos.permission.GRANT_SENSITIVE_PERMISSIONS",
+        "reason": "ceshi"
+      },
       {
         "name": "ohos.permission.DISTRIBUTED_DATASYNC",
         "reason": "ceshi"
+      },
+      {
+        "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
+        "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
+      },
+      {
+        "name":"ohos.permission.GET_BUNDLE_INFO",
+        "reason":"need use ohos.permission.GET_BUNDLE_INFO"
+      },
+      {
+        "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE",
+        "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE"
+      },
+      {
+        "name":"ohos.permission.REMOVE_CACHE_FILES",
+        "reason":"need use ohos.permission.REMOVE_CACHE_FILES"
+      },
+      {
+        "name":"ohos.permission.LISTEN_BUNDLE_CHANGE",
+        "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE"
       }
     ],
     "abilities": [

account/appaccount/actssetchecksyncenable/entry/src/main/js/test/Syncenable.test.js

@@ -12,10 +12,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
 import account from '@ohos.account.appAccount'
+import bundle from '@ohos.bundle'
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
 
+const TIMEOUT = 2000;
+const PERMISSION_USER_SET = 1;
+const PERMISSION_USER_NAME = "ohos.permission.DISTRIBUTED_DATASYNC";
+var tokenID = undefined;
 describe('ActsSetCheckSyncEnable', function () {
+    beforeAll(async function (done) {
+        console.debug("====>beforeAll start====");
+        var appInfo = await bundle.getApplicationInfo('com.example.actssetchecksyncenable', 0, 100);
+        tokenID = appInfo.accessTokenId;
+        console.debug("accessTokenId" + appInfo.accessTokenId + " bundleName:" + appInfo.bundleName);
+        var atManager = abilityAccessCtrl.createAtManager();
+        var result = await atManager.grantUserGrantedPermission(tokenID, PERMISSION_USER_NAME, PERMISSION_USER_SET);
+        console.debug("tokenId" + tokenID + " result:" + result);
+        sleep(TIMEOUT);
+        console.debug("====>beforeAll end====");
+        done();
+    })
+
+    function sleep(delay) {
+        var start = (new Date()).getTime();
+        while((new Date()).getTime() - start < delay) {
+            continue;
+        }
+    }
 
     /*
      * @tc.number    : ActsSetCheckSyncEnable_0100

account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/entry/src/main/config.json

@@ -35,6 +35,26 @@
       {
         "name": "ohos.permission.GET_ACCOUNTS_PRIVILEGED",
         "reason": "ceshi"
+      },
+      {
+        "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
+        "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
+      },
+      {
+        "name":"ohos.permission.GET_BUNDLE_INFO",
+        "reason":"need use ohos.permission.GET_BUNDLE_INFO"
+      },
+      {
+        "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE",
+        "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE"
+      },
+      {
+        "name":"ohos.permission.REMOVE_CACHE_FILES",
+        "reason":"need use ohos.permission.REMOVE_CACHE_FILES"
+      },
+      {
+        "name":"ohos.permission.LISTEN_BUNDLE_CHANGE",
+        "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE"
       }
     ],
     "abilities": [

account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/entry/src/main/config.json

@@ -35,6 +35,26 @@
       {
         "name": "ohos.permission.GET_ACCOUNTS_PRIVILEGED",
         "reason": "ceshi"
+      },
+      {
+        "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
+        "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
+      },
+      {
+        "name":"ohos.permission.GET_BUNDLE_INFO",
+        "reason":"need use ohos.permission.GET_BUNDLE_INFO"
+      },
+      {
+        "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE",
+        "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE"
+      },
+      {
+        "name":"ohos.permission.REMOVE_CACHE_FILES",
+        "reason":"need use ohos.permission.REMOVE_CACHE_FILES"
+      },
+      {
+        "name":"ohos.permission.LISTEN_BUNDLE_CHANGE",
+        "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE"
       }
     ],
     "abilities": [

account/appaccount/sceneProject/actsaccountaccessibleFirst/entry/src/main/config.json

@@ -24,6 +24,28 @@
       "moduleName": "entry",
       "moduleType": "entry"
     },
+    "reqPermissions": [
+      {
+        "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
+        "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
+      },
+      {
+        "name":"ohos.permission.GET_BUNDLE_INFO",
+        "reason":"need use ohos.permission.GET_BUNDLE_INFO"
+      },
+      {
+        "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE",
+        "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE"
+      },
+      {
+        "name":"ohos.permission.REMOVE_CACHE_FILES",
+        "reason":"need use ohos.permission.REMOVE_CACHE_FILES"
+      },
+      {
+        "name":"ohos.permission.LISTEN_BUNDLE_CHANGE",
+        "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE"
+      }
+    ],
     "abilities": [
       {
         "skills": [

account/osaccount/actsosaccountpermissiontest/actsosaccountpermissionnotest/Test.json

@@ -10,7 +10,7 @@
         {
             "test-file-name": [
                 "ActsOsAccountPermissionNoTest.hap",
-                "ActsOsAccountScenePermission"
+                "ActsOsAccountScenePermission.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true