From 1155e9e0277f998abd4a804f9beee006a8c61767 Mon Sep 17 00:00:00 2001 From: q00313334 Date: Fri, 25 Feb 2022 03:55:33 +0800 Subject: [PATCH] 3516quanli1@huawei.com Signed-off-by: q00313334 --- .../signature/openharmony_sx.p7b | Bin 3437 -> 3443 bytes .../bluetooth_ble/src/main/config.json | 44 ++++++++++++++++++ .../bluetooth_on/signature/openharmony_sx.p7b | Bin 3437 -> 3443 bytes .../bluetooth_on/src/main/config.json | 44 ++++++++++++++++++ .../signature/openharmony_sx.p7b | Bin 3437 -> 3443 bytes .../bluetooth_standard/src/main/config.json | 44 ++++++++++++++++++ .../src/main/js/default/test/WifiSta.test.js | 5 +- 7 files changed, 135 insertions(+), 2 deletions(-) diff --git a/communication/bluetooth_ble/signature/openharmony_sx.p7b b/communication/bluetooth_ble/signature/openharmony_sx.p7b index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..66b4457a8a81fb8d3356cf46d67226c850944858 100644 GIT binary patch delta 988 zcmZ9L&2QUu9LDQ3ZE4qTNQ_A#Ic>& zsohklC_)unCaN%LC)NW3X&N9v z{JMO9`2dWUoZ0#34%x%smyo&G@p$QSgz7N_L6^X(+4;+dETT`xV+a_}ocT{gj>j`o z@p1gG{lu<5@Y;^Ora4VL@jSYE0&KMxfdrZaNsw4g42SJz^x^>9Y-F?g8s3V|(T($G z{5|(yZ=hSc>gkE2&c&nK=P%&dbY=s`@XTt$cKkK9~r9waIB@<&@~^ zHmeSLj=eW|0eR`1Fd|9V&)O(9>m<#obpbWKz1p}P&c8!|Gi5=Nm+ zKu@OWY*4GK>UMMP~9j0#cfza|;vsB6gI%9D_t|~RV&@%+ob9RRfUFt)5;!dAk zFbKI}4zzaNo?MyE9OR0AI2f8%-PX1V$>W=WR_o`7S*K7c8>#>Uh9vvUj*!k0P@o72 zQYwT&P2xhx`zk0(n46}!VaoODc3x=aNy?D$5{p`ZNEaECumq#o#zw7--OYNgI-(^m z1*(O>ZTT4qa%8~n3?Ww0t#Ui%)a?tDa}#ZxcS_=7)>eq1@$e|YPi zTfI-OPCfC{Z;$^HDeqQ4!M}+eeEm_7{`}1ZRwPNG(;tKX)y;R+NO5CnoJtweQnovT03zP=fldOw&TQ!9XoaG zI5tC-a;T6%NL4Oq2R05voM2*HkdV;0Ax$7n)8K}XKyZOc?64COZqbT3zQ6zTd-NWj z|C7sqTs}f)iT={c>&Nu*(?n!BdTW*tLsXAOBG?OPVrk{zn2x9mv1nxR0y^i4{kOQm;GnH?;@iI|qNC3PLu4y{}^o64afetQ#f{L$%tTQyW^tRnMxWIbVN z*0`fiRKpsn_IxLDZM8(;IFM64;4u*N7_wF=i$XAeFY@sbHz2XL$r4P!)r53IQ#dvt zy^sdyYye%BAA308BI-O(kzSFg4ah1B0R=FD#35U3n_{}I$-|B=r?MtnAw9x7o2E%m z3nZ%Uszc3?2PDse%)ge#(p8~ywA-OVu}1RYC!R&qv*=kOu#h=Zz?9vW)6kHInx+h~ ziEQd#qXufQryOefpwu?YJOg2`clIjtEQB7115g2bf$G*UlH|!r&ZD$c*Ofgw@C!{> zbUeN0Hkkq4M78X+ZK|BwlNBC^9l`Fj2yEKIn<5Sa($-shX5Qi%#^gF~YTplbEsXI5 z0(4=ItJ77MqzKSxn>|>QHCyS=XAAkGwz-Q3g=v=#nyBG7b(*VSYAGXjt?dnY!~&1P z@k6T0W(p9n1mpoBdcYF_y3maApPpA02-Y89(s0CCi@IjU{CB^q!U%jlzxs?<7!Wt#473tCqp@*8?Z zA$(3S_MB4Pw9~Y{A2jpDLMJ=6l|nGSI=>!Ey`)a1;mA;vLqEJ&qpwJ($9nfsOkBQ* zqqE4hupFp9mloCe&G_>3|1Zh>^LX+ILvvUbO{Mecyohd}cV;DqA+dGu;i~cpcCYm~ z`o-;ygDY#z8`p)OKYb|wb@I(;Kjhze7rnUjT-e9&uErLkF$yK4>voBFHNN)ew@!LE zdGn^t;gj#hzl$HrhsB>BzaM|?jp!>EzRW1zqXqWI8%W~P+KYFrUw`}P;NC&`_6K+F MkH7x?LGzb?0ItqZ1poj5 diff --git a/communication/bluetooth_ble/src/main/config.json b/communication/bluetooth_ble/src/main/config.json index 0cdb83145..b56e3760b 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 GIT binary patch delta 988 zcmZ9L&2QUu9LDQ3ZE4qTNQ_A#Ic>& zsohklC_)unCaN%LC)NW3X&N9v z{JMO9`2dWUoZ0#34%x%smyo&G@p$QSgz7N_L6^X(+4;+dETT`xV+a_}ocT{gj>j`o z@p1gG{lu<5@Y;^Ora4VL@jSYE0&KMxfdrZaNsw4g42SJz^x^>9Y-F?g8s3V|(T($G z{5|(yZ=hSc>gkE2&c&nK=P%&dbY=s`@XTt$cKkK9~r9waIB@<&@~^ zHmeSLj=eW|0eR`1Fd|9V&)O(9>m<#obpbWKz1p}P&c8!|Gi5=Nm+ zKu@OWY*4GK>UMMP~9j0#cfza|;vsB6gI%9D_t|~RV&@%+ob9RRfUFt)5;!dAk zFbKI}4zzaNo?MyE9OR0AI2f8%-PX1V$>W=WR_o`7S*K7c8>#>Uh9vvUj*!k0P@o72 zQYwT&P2xhx`zk0(n46}!VaoODc3x=aNy?D$5{p`ZNEaECumq#o#zw7--OYNgI-(^m z1*(O>ZTT4qa%8~n3?Ww0t#Ui%)a?tDa}#ZxcS_=7)>eq1@$e|YPi zTfI-OPCfC{Z;$^HDeqQ4!M}+eeEm_7{`}1ZRwPNG(;tKX)y;R+NO5CnoJtweQnovT03zP=fldOw&TQ!9XoaG zI5tC-a;T6%NL4Oq2R05voM2*HkdV;0Ax$7n)8K}XKyZOc?64COZqbT3zQ6zTd-NWj z|C7sqTs}f)iT={c>&Nu*(?n!BdTW*tLsXAOBG?OPVrk{zn2x9mv1nxR0y^i4{kOQm;GnH?;@iI|qNC3PLu4y{}^o64afetQ#f{L$%tTQyW^tRnMxWIbVN z*0`fiRKpsn_IxLDZM8(;IFM64;4u*N7_wF=i$XAeFY@sbHz2XL$r4P!)r53IQ#dvt zy^sdyYye%BAA308BI-O(kzSFg4ah1B0R=FD#35U3n_{}I$-|B=r?MtnAw9x7o2E%m z3nZ%Uszc3?2PDse%)ge#(p8~ywA-OVu}1RYC!R&qv*=kOu#h=Zz?9vW)6kHInx+h~ ziEQd#qXufQryOefpwu?YJOg2`clIjtEQB7115g2bf$G*UlH|!r&ZD$c*Ofgw@C!{> zbUeN0Hkkq4M78X+ZK|BwlNBC^9l`Fj2yEKIn<5Sa($-shX5Qi%#^gF~YTplbEsXI5 z0(4=ItJ77MqzKSxn>|>QHCyS=XAAkGwz-Q3g=v=#nyBG7b(*VSYAGXjt?dnY!~&1P z@k6T0W(p9n1mpoBdcYF_y3maApPpA02-Y89(s0CCi@IjU{CB^q!U%jlzxs?<7!Wt#473tCqp@*8?Z zA$(3S_MB4Pw9~Y{A2jpDLMJ=6l|nGSI=>!Ey`)a1;mA;vLqEJ&qpwJ($9nfsOkBQ* zqqE4hupFp9mloCe&G_>3|1Zh>^LX+ILvvUbO{Mecyohd}cV;DqA+dGu;i~cpcCYm~ z`o-;ygDY#z8`p)OKYb|wb@I(;Kjhze7rnUjT-e9&uErLkF$yK4>voBFHNN)ew@!LE zdGn^t;gj#hzl$HrhsB>BzaM|?jp!>EzRW1zqXqWI8%W~P+KYFrUw`}P;NC&`_6K+F MkH7x?LGzb?0ItqZ1poj5 diff --git a/communication/bluetooth_on/src/main/config.json b/communication/bluetooth_on/src/main/config.json index 0cdb83145..b56e3760b 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 GIT binary patch delta 988 zcmZ9L&2QUu9LDQ3ZE4qTNQ_A#Ic>& zsohklC_)unCaN%LC)NW3X&N9v z{JMO9`2dWUoZ0#34%x%smyo&G@p$QSgz7N_L6^X(+4;+dETT`xV+a_}ocT{gj>j`o z@p1gG{lu<5@Y;^Ora4VL@jSYE0&KMxfdrZaNsw4g42SJz^x^>9Y-F?g8s3V|(T($G z{5|(yZ=hSc>gkE2&c&nK=P%&dbY=s`@XTt$cKkK9~r9waIB@<&@~^ zHmeSLj=eW|0eR`1Fd|9V&)O(9>m<#obpbWKz1p}P&c8!|Gi5=Nm+ zKu@OWY*4GK>UMMP~9j0#cfza|;vsB6gI%9D_t|~RV&@%+ob9RRfUFt)5;!dAk zFbKI}4zzaNo?MyE9OR0AI2f8%-PX1V$>W=WR_o`7S*K7c8>#>Uh9vvUj*!k0P@o72 zQYwT&P2xhx`zk0(n46}!VaoODc3x=aNy?D$5{p`ZNEaECumq#o#zw7--OYNgI-(^m z1*(O>ZTT4qa%8~n3?Ww0t#Ui%)a?tDa}#ZxcS_=7)>eq1@$e|YPi zTfI-OPCfC{Z;$^HDeqQ4!M}+eeEm_7{`}1ZRwPNG(;tKX)y;R+NO5CnoJtweQnovT03zP=fldOw&TQ!9XoaG zI5tC-a;T6%NL4Oq2R05voM2*HkdV;0Ax$7n)8K}XKyZOc?64COZqbT3zQ6zTd-NWj z|C7sqTs}f)iT={c>&Nu*(?n!BdTW*tLsXAOBG?OPVrk{zn2x9mv1nxR0y^i4{kOQm;GnH?;@iI|qNC3PLu4y{}^o64afetQ#f{L$%tTQyW^tRnMxWIbVN z*0`fiRKpsn_IxLDZM8(;IFM64;4u*N7_wF=i$XAeFY@sbHz2XL$r4P!)r53IQ#dvt zy^sdyYye%BAA308BI-O(kzSFg4ah1B0R=FD#35U3n_{}I$-|B=r?MtnAw9x7o2E%m z3nZ%Uszc3?2PDse%)ge#(p8~ywA-OVu}1RYC!R&qv*=kOu#h=Zz?9vW)6kHInx+h~ ziEQd#qXufQryOefpwu?YJOg2`clIjtEQB7115g2bf$G*UlH|!r&ZD$c*Ofgw@C!{> zbUeN0Hkkq4M78X+ZK|BwlNBC^9l`Fj2yEKIn<5Sa($-shX5Qi%#^gF~YTplbEsXI5 z0(4=ItJ77MqzKSxn>|>QHCyS=XAAkGwz-Q3g=v=#nyBG7b(*VSYAGXjt?dnY!~&1P z@k6T0W(p9n1mpoBdcYF_y3maApPpA02-Y89(s0CCi@IjU{CB^q!U%jlzxs?<7!Wt#473tCqp@*8?Z zA$(3S_MB4Pw9~Y{A2jpDLMJ=6l|nGSI=>!Ey`)a1;mA;vLqEJ&qpwJ($9nfsOkBQ* zqqE4hupFp9mloCe&G_>3|1Zh>^LX+ILvvUbO{Mecyohd}cV;DqA+dGu;i~cpcCYm~ z`o-;ygDY#z8`p)OKYb|wb@I(;Kjhze7rnUjT-e9&uErLkF$yK4>voBFHNN)ew@!LE zdGn^t;gj#hzl$HrhsB>BzaM|?jp!>EzRW1zqXqWI8%W~P+KYFrUw`}P;NC&`_6K+F MkH7x?LGzb?0ItqZ1poj5 diff --git a/communication/bluetooth_standard/src/main/config.json b/communication/bluetooth_standard/src/main/config.json index 0cdb83145..b56e3760b 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 5f6b2cac9..7c48c3a20 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) }) /** -- GitLab