quanli125@huawei.com

Signed-off-by: Nq00313334 <quanli1@huawei.com>

communication/bluetooth_ble/src/main/js/default/test/BluetoothBle.test.js

@@ -126,24 +126,6 @@ describe('bluetoothhostTest', function() {
     })
 
 
-    /**
-     * @tc.number SUB_COMMUNACATION_bluetoothble_CREATE_GATT_SERVER_0001
-     * @tc.name testCreateGattServer
-     * @tc.desc Test CreateGattServer api .
-     * @tc.size MEDIUM
-     * @tc.type Function
-     * @tc.level Level 2
-     */
-    it('SUB_COMMUNACATION_bluetoothble_CREATE_GATT_SERVER_0001', 0, async function (done) {
-        console.info('[bluetooth_js] createGattServer test start ...');
-        await tryToEnableBt();
-        let result = bluetooth.BLE.createGattServer();
-        let resultLength = Object.keys(result).length;
-        console.info("[bluetooth_js] createGattServer:" + JSON.stringify(result) + "length:" + resultLength);
-        expect(resultLength).assertEqual(1);
-        done();
-    })
-
 
     /**
      * @tc.number SUB_COMMUNACATION_bluetooth_START_ADVERTISING_0001

communication/wifi_p2p/src/main/config.json

@@ -57,6 +57,38 @@
         }
       }
     ],
+    "defPermissions": [
+      {
+        "availableScope": [],
+        "grantMode": "user_grant",
+        "name": "ohos.permission.ACCESS_LOCATION",
+        "availableLevel": "system_basic",
+          "provisionEnable": true,
+          "distributedSceneEnable": true,
+          "label": "ACCESS_LOCATION label",
+          "description": "ACCESS_LOCATION description"
+      },
+    {
+        "availableScope": [],
+        "grantMode": "system_grant",
+        "name": "ohos.permission.MANAGE_SECURE_SETTINGS",
+        "availableLevel": "system_basic",
+          "provisionEnable": true,
+          "distributedSceneEnable": false,
+          "label": "MANAGE_SECURE_SETTINGS label",
+          "description": "MANAGE_SECURE_SETTINGS description"
+      },
+      {
+        "availableScope": [],
+        "grantMode": "user_grant",
+        "name": "ohos.permission.LOCATION",
+       "availableLevel": "system_basic",
+          "provisionEnable": true,
+          "distributedSceneEnable": true,
+          "label": "LOCATION label",
+          "description": "LOCATION description"
+      }
+    ],
     "reqPermissions": [
       {
         "name" : "ohos.permission.GET_WIFI_INFO",
@@ -82,10 +114,14 @@
         "name" : "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
         "reason" : "use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
       },
-      {
+       {
         "name" : "ohos.permission.GET_WIFI_LOCAL_MAC",
         "reason" : "use ohos.permission.GET_WIFI_LOCAL_MAC"
       },
+      {
+        "name" : "ohos.permission.GET_WIFI_PEERS_MAC",
+        "reason" : "use ohos.permission.GET_WIFI_PEERS_MAC"
+      },
       {
         "name" : "ohos.permission.MANAGE_WIFI_HOTSPOT",
         "reason" : "use ohos.permission.MANAGE_WIFI_HOTSPOT"
@@ -93,7 +129,62 @@
       {
         "name" : "ohos.permission.GET_WIFI_INFO_INTERNAL",
         "reason" : "use ohos.permission.GET_WIFI_INFO_INTERNAL"
+      },
+       {
+        "name": "ohos.permission.LOCATION",
+        "reason": "need use ohos.permission.LOCATION",
+        "usedScene": {
+          "ability": [
+            "ohos.acts.location.geolocation.function.MainAbility"
+          ],
+          "when": "inuse"
+        }
+      },
+      {
+        "name":"ohos.permission.ACCESS_LOCATION",
+        "reason":"need use ohos.permission.ACCESS_LOCATION",
+        "usedScene": {
+          "ability": [
+            "ohos.acts.location.geolocation.function.MainAbility"
+          ],
+          "when": "inuse"
+        }
+      },
+      {
+        "name":"ohos.permission.LOCATION_IN_BACKGROUND",
+        "reason":"need use ohos.permission.LOCATION_IN_BACKGROUND",
+        "usedScene": {
+          "ability": [
+            "ohos.acts.location.geolocation.function.MainAbility"
+          ],
+          "when": "inuse"
+        }
+      },
+   {
+        "name":"ohos.permission.MANAGE_SECURE_SETTINGS",
+        "reason":"need use ohos.permission.MANAGE_SECURE_SETTINGS",
+        "usedScene": {
+          "ability": [
+            "ohos.acts.location.geolocation.function.MainAbility"
+          ],
+          "when": "inuse"
+        }
+      },
+     {
+        "name": "ohos.permission.GRANT_SENSITIVE_PERMISSIONS",
+        "reason": "use ohos.permission.GRANT_SENSITIVE_PERMISSIONS"
+      },
+      {
+        "name": "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS",
+        "reason": "use ohos.permission.REVOKE_SENSITIVE_PERMISSIONS"
+      },
+      {
+        "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
+      },
+      {
+        "name": "ohos.permission.GET_BUNDLE_INFO"
       }
     ]
   }
 }
+

communication/wifi_standard/src/main/config.json

@@ -57,6 +57,38 @@
         }
       }
     ],
+    "defPermissions": [
+      {
+        "availableScope": [],
+        "grantMode": "user_grant",
+        "name": "ohos.permission.ACCESS_LOCATION",
+        "availableLevel": "system_basic",
+          "provisionEnable": true,
+          "distributedSceneEnable": true,
+          "label": "ACCESS_LOCATION label",
+          "description": "ACCESS_LOCATION description"
+      },
+    {
+        "availableScope": [],
+        "grantMode": "system_grant",
+        "name": "ohos.permission.MANAGE_SECURE_SETTINGS",
+        "availableLevel": "system_basic",
+          "provisionEnable": true,
+          "distributedSceneEnable": false,
+          "label": "MANAGE_SECURE_SETTINGS label",
+          "description": "MANAGE_SECURE_SETTINGS description"
+      },
+      {
+        "availableScope": [],
+        "grantMode": "user_grant",
+        "name": "ohos.permission.LOCATION",
+       "availableLevel": "system_basic",
+          "provisionEnable": true,
+          "distributedSceneEnable": true,
+          "label": "LOCATION label",
+          "description": "LOCATION description"
+      }
+    ],
     "reqPermissions": [
       {
         "name" : "ohos.permission.GET_WIFI_INFO",
@@ -82,10 +114,14 @@
         "name" : "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
         "reason" : "use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
       },
-      {
+       {
         "name" : "ohos.permission.GET_WIFI_LOCAL_MAC",
         "reason" : "use ohos.permission.GET_WIFI_LOCAL_MAC"
       },
+      {
+        "name" : "ohos.permission.GET_WIFI_PEERS_MAC",
+        "reason" : "use ohos.permission.GET_WIFI_PEERS_MAC"
+      },
       {
         "name" : "ohos.permission.MANAGE_WIFI_HOTSPOT",
         "reason" : "use ohos.permission.MANAGE_WIFI_HOTSPOT"
@@ -93,6 +129,60 @@
       {
         "name" : "ohos.permission.GET_WIFI_INFO_INTERNAL",
         "reason" : "use ohos.permission.GET_WIFI_INFO_INTERNAL"
+      },
+       {
+        "name": "ohos.permission.LOCATION",
+        "reason": "need use ohos.permission.LOCATION",
+        "usedScene": {
+          "ability": [
+            "ohos.acts.location.geolocation.function.MainAbility"
+          ],
+          "when": "inuse"
+        }
+      },
+      {
+        "name":"ohos.permission.ACCESS_LOCATION",
+        "reason":"need use ohos.permission.ACCESS_LOCATION",
+        "usedScene": {
+          "ability": [
+            "ohos.acts.location.geolocation.function.MainAbility"
+          ],
+          "when": "inuse"
+        }
+      },
+      {
+        "name":"ohos.permission.LOCATION_IN_BACKGROUND",
+        "reason":"need use ohos.permission.LOCATION_IN_BACKGROUND",
+        "usedScene": {
+          "ability": [
+            "ohos.acts.location.geolocation.function.MainAbility"
+          ],
+          "when": "inuse"
+        }
+      },
+   {
+        "name":"ohos.permission.MANAGE_SECURE_SETTINGS",
+        "reason":"need use ohos.permission.MANAGE_SECURE_SETTINGS",
+        "usedScene": {
+          "ability": [
+            "ohos.acts.location.geolocation.function.MainAbility"
+          ],
+          "when": "inuse"
+        }
+      },
+     {
+        "name": "ohos.permission.GRANT_SENSITIVE_PERMISSIONS",
+        "reason": "use ohos.permission.GRANT_SENSITIVE_PERMISSIONS"
+      },
+      {
+        "name": "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS",
+        "reason": "use ohos.permission.REVOKE_SENSITIVE_PERMISSIONS"
+      },
+      {
+        "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
+      },
+      {
+        "name": "ohos.permission.GET_BUNDLE_INFO"
       }
     ]
   }