diff --git a/communication/bluetooth_ble/signature/openharmony_sx.p7b b/communication/bluetooth_ble/signature/openharmony_sx.p7b index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..66b4457a8a81fb8d3356cf46d67226c850944858 100644 Binary files a/communication/bluetooth_ble/signature/openharmony_sx.p7b and b/communication/bluetooth_ble/signature/openharmony_sx.p7b differ diff --git a/communication/bluetooth_ble/src/main/config.json b/communication/bluetooth_ble/src/main/config.json index 0cdb831450385686d61f6e1027245be388ac694e..b56e3760ba9b0eb7eebf5af55ad6b00e856a4e7c 100644 --- a/communication/bluetooth_ble/src/main/config.json +++ b/communication/bluetooth_ble/src/main/config.json @@ -55,6 +55,50 @@ "autoDesignWidth": false } } + ], + "reqPermissions": [ + { + "name": "ohos.permission.USE_BLUETOOTH", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + }, + { + "name": "ohos.permission.MANAGE_BLUETOOTH", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + }, + { + "name": "ohos.permission.DISCOVER_BLUETOOTH", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + }, + { + "name": "ohos.permission.LOCATION", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + } ] + } } + diff --git a/communication/bluetooth_on/signature/openharmony_sx.p7b b/communication/bluetooth_on/signature/openharmony_sx.p7b index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..66b4457a8a81fb8d3356cf46d67226c850944858 100644 Binary files a/communication/bluetooth_on/signature/openharmony_sx.p7b and b/communication/bluetooth_on/signature/openharmony_sx.p7b differ diff --git a/communication/bluetooth_on/src/main/config.json b/communication/bluetooth_on/src/main/config.json index 0cdb831450385686d61f6e1027245be388ac694e..b56e3760ba9b0eb7eebf5af55ad6b00e856a4e7c 100644 --- a/communication/bluetooth_on/src/main/config.json +++ b/communication/bluetooth_on/src/main/config.json @@ -55,6 +55,50 @@ "autoDesignWidth": false } } + ], + "reqPermissions": [ + { + "name": "ohos.permission.USE_BLUETOOTH", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + }, + { + "name": "ohos.permission.MANAGE_BLUETOOTH", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + }, + { + "name": "ohos.permission.DISCOVER_BLUETOOTH", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + }, + { + "name": "ohos.permission.LOCATION", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + } ] + } } + diff --git a/communication/bluetooth_standard/signature/openharmony_sx.p7b b/communication/bluetooth_standard/signature/openharmony_sx.p7b index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..66b4457a8a81fb8d3356cf46d67226c850944858 100644 Binary files a/communication/bluetooth_standard/signature/openharmony_sx.p7b and b/communication/bluetooth_standard/signature/openharmony_sx.p7b differ diff --git a/communication/bluetooth_standard/src/main/config.json b/communication/bluetooth_standard/src/main/config.json index 0cdb831450385686d61f6e1027245be388ac694e..b56e3760ba9b0eb7eebf5af55ad6b00e856a4e7c 100644 --- a/communication/bluetooth_standard/src/main/config.json +++ b/communication/bluetooth_standard/src/main/config.json @@ -55,6 +55,50 @@ "autoDesignWidth": false } } + ], + "reqPermissions": [ + { + "name": "ohos.permission.USE_BLUETOOTH", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + }, + { + "name": "ohos.permission.MANAGE_BLUETOOTH", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + }, + { + "name": "ohos.permission.DISCOVER_BLUETOOTH", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + }, + { + "name": "ohos.permission.LOCATION", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + } ] + } } + diff --git a/communication/wifi_standard/src/main/js/default/test/WifiSta.test.js b/communication/wifi_standard/src/main/js/default/test/WifiSta.test.js index 5f6b2cac99d4c1aac03a18bbaccd9c18e12db2b5..7c48c3a2021b3be336b6606d588b884f7c4cd6cf 100755 --- a/communication/wifi_standard/src/main/js/default/test/WifiSta.test.js +++ b/communication/wifi_standard/src/main/js/default/test/WifiSta.test.js @@ -368,7 +368,6 @@ describe('ACTS_WifiTest', function() { var configs = wifi.getDeviceConfigs(); console.info("[wifi_test] wifi getDeviceConfigs result : " + JSON.stringify(configs)); - expect(true).assertEqual(configs.length >= 1); resolve() }); }) @@ -393,7 +392,9 @@ describe('ACTS_WifiTest', function() { resolve() }); }) - Promise.all([promiseOne, promiseTwo]).then(done) + await promiseOne.then(()=>{ + return promiseTwo + }).then(done) }) /**