OSDN Git Service
Yi Kong [Fri, 24 May 2019 23:55:38 +0000 (16:55 -0700)]
Merge "Turn off the new pass manager for coverage builds" am:
0745b6e550 am:
59979606c6
am:
deef7599ac
Change-Id: Ia5d9952b66095bceae8606822136105613801e90
Yi Kong [Fri, 24 May 2019 18:18:08 +0000 (11:18 -0700)]
Merge "Turn off the new pass manager for coverage builds" am:
0745b6e550
am:
59979606c6
Change-Id: Id5b7472e3dd240ab687431072320a5cea965b353
Yi Kong [Fri, 24 May 2019 18:10:42 +0000 (11:10 -0700)]
Merge "Turn off the new pass manager for coverage builds"
am:
0745b6e550
Change-Id: Ib4a330c7cefacba8bb2f29b83988c73a5e23fba3
Yi Kong [Fri, 24 May 2019 17:33:26 +0000 (17:33 +0000)]
Merge "Turn off the new pass manager for coverage builds"
Jakub Pawlowski [Thu, 23 May 2019 21:04:48 +0000 (14:04 -0700)]
Fix CryptoToolboxTest.bt_spec_test_d_1_test am:
0a2f6b52e2 am:
2aa3c39a7b
am:
9ef5b1b2fe
Change-Id: I17e7fec7ddffb2b2e90de06fba5373485f714046
Jakub Pawlowski [Thu, 23 May 2019 20:16:33 +0000 (13:16 -0700)]
Fix CryptoToolboxTest.bt_spec_test_d_1_test am:
0a2f6b52e2
am:
2aa3c39a7b
Change-Id: Ic8c79ffb852a2226ebaa800c1f1b7e19dce1aa2d
Jakub Pawlowski [Thu, 23 May 2019 18:14:17 +0000 (11:14 -0700)]
Fix CryptoToolboxTest.bt_spec_test_d_1_test
am:
0a2f6b52e2
Change-Id: Ia2e928cfb293434450426b77b7081681b304f8d8
Jakub Pawlowski [Thu, 23 May 2019 12:42:50 +0000 (05:42 -0700)]
Get rid of KEY_LENGTH_DWORDS_P192 am:
24ad423f63 am:
e56a0b8ee9
am:
8b80062bc5
Change-Id: Ibdecc675c7f15303be0801cc92d3d1a98a363fcb
Jakub Pawlowski [Thu, 23 May 2019 10:43:47 +0000 (03:43 -0700)]
Get rid of KEY_LENGTH_DWORDS_P192 am:
24ad423f63
am:
e56a0b8ee9
Change-Id: I02fc07cae2ccd57e11e7911530d9485902f9e88a
Jakub Pawlowski [Thu, 23 May 2019 09:01:21 +0000 (02:01 -0700)]
Get rid of KEY_LENGTH_DWORDS_P192
am:
24ad423f63
Change-Id: I45718435e6721aa84a9523faf7790be6aa122b7f
Myles Watson [Thu, 23 May 2019 08:46:18 +0000 (01:46 -0700)]
Merge "PDL: Strengthen CamelCase checks" am:
957842ff56 am:
20234b69a5
am:
500d96f1f1
Change-Id: I2e83c77c8fd6163f62f262f370218d5faccea0d3
Jakub Pawlowski [Thu, 23 May 2019 08:35:16 +0000 (01:35 -0700)]
crypto_toolbox am:
5c70347620 am:
2e52b0413b
am:
d7a1b95122
Change-Id: Ie0d00dae00fb4ed352e93fb3f87740cb31e5e763
Jakub Pawlowski [Thu, 23 May 2019 07:52:34 +0000 (09:52 +0200)]
Fix CryptoToolboxTest.bt_spec_test_d_1_test
When moving code, ElementsAreArray matcher was replaced by memcmp to
remove dependency, but "== 0" is missing to actually make sure elements
are same.
Bug:
132863815
Test: CryptoToolboxTest.bt_spec_test_d_1_test
Change-Id: I4069ee3baea9de095b23072820cef3bd0673608a
Yi Kong [Tue, 23 Apr 2019 07:55:27 +0000 (00:55 -0700)]
Turn off the new pass manager for coverage builds
The new pass manager crashes if `-fprofile-instr-generat` cflag is set
on the current stable Android compiler. Turn it off until we roll past
the revision with the fix.
Test: build
Bug:
131855431
Bug:
131132095
Change-Id: I92f36b73747cca898e104118a2721a4796511282
Jakub Pawlowski [Wed, 27 Feb 2019 09:00:17 +0000 (10:00 +0100)]
Get rid of KEY_LENGTH_DWORDS_P192
Only KEY_LENGTH_DWORDS_P256 is used.
Test: compilation
Bug:
126463795
Change-Id: I32a80e4b012c4606a70994fa9d0b5c2602707bb3
Myles Watson [Thu, 23 May 2019 04:40:43 +0000 (21:40 -0700)]
Merge "PDL: Strengthen CamelCase checks" am:
957842ff56
am:
20234b69a5
Change-Id: I0671872b21ba25daccb445a95f8cd991b25e00f3
Jakub Pawlowski [Thu, 23 May 2019 04:36:30 +0000 (21:36 -0700)]
crypto_toolbox am:
5c70347620
am:
2e52b0413b
Change-Id: Ib453828803a82501985e147d3edfc5c7365906fc
Myles Watson [Thu, 23 May 2019 02:00:02 +0000 (19:00 -0700)]
Merge "PDL: Strengthen CamelCase checks"
am:
957842ff56
Change-Id: Iedb4254872db5fded4731c20df6d075bd203f057
Jakub Pawlowski [Thu, 23 May 2019 01:56:14 +0000 (18:56 -0700)]
crypto_toolbox
am:
5c70347620
Change-Id: I80c9e53d5beffc5fea7a310c72454fdeaf2d1dbe
Treehugger Robot [Wed, 22 May 2019 22:26:17 +0000 (22:26 +0000)]
Merge "PDL: Strengthen CamelCase checks"
Myles Watson [Wed, 22 May 2019 17:52:49 +0000 (10:52 -0700)]
PDL: Strengthen CamelCase checks
Test: bluetooth_packet_parser_test
Change-Id: I1f85a0435aeab79cee8b938061c3961b6a21c49b
Jakub Pawlowski [Wed, 22 May 2019 15:36:24 +0000 (17:36 +0200)]
crypto_toolbox
This is copy of the crypto_toolbox for GD usage.
Only necessary changes were made:
* removed dependency on bt_types.h
* removed dependency on libbase
* reformatted code
* added namespace
Further improvements will be stacked on top of this patch.
Test: CryptoToolboxTest
Bug:
132863815
Change-Id: I639ba42705b23218a14085abcf431d744f87b913
Evgenii Stepanov [Wed, 22 May 2019 11:39:53 +0000 (04:39 -0700)]
Merge "Fix use-after-free in ReactorPerformanceTest::TearDown." am:
6af0cf0de9 am:
e32c07ae04
am:
23e402bb5b
Change-Id: I88b57d349667d579f448558a553aa1cd32d5225e
Evgenii Stepanov [Wed, 22 May 2019 04:11:23 +0000 (21:11 -0700)]
Merge "Fix use-after-free in ReactorPerformanceTest::TearDown." am:
6af0cf0de9
am:
e32c07ae04
Change-Id: I95055d3a54b2769e7f2ac00473609e5ebbb2eb47
Evgenii Stepanov [Wed, 22 May 2019 03:10:15 +0000 (20:10 -0700)]
Merge "Fix use-after-free in ReactorPerformanceTest::TearDown."
am:
6af0cf0de9
Change-Id: If9d01dd2f3a6cef54ded5ad66bff85039943e511
Treehugger Robot [Wed, 22 May 2019 00:18:35 +0000 (00:18 +0000)]
Merge "Fix use-after-free in ReactorPerformanceTest::TearDown."
Ugo Yu [Wed, 22 May 2019 00:12:52 +0000 (17:12 -0700)]
Merge "Pairng: Fix crosskey paring" into qt-dev am:
079ebe2abe
am:
88c92da9ae
Change-Id: I2c5fff0c8af05af899007b83906da8e30bcdea01
Evgenii Stepanov [Tue, 21 May 2019 21:12:39 +0000 (14:12 -0700)]
Fix use-after-free in ReactorPerformanceTest::TearDown.
Bug:
128921871
Test: net_test_performance
Change-Id: I7b7fda7c437f75019564a0b56764d40704b0b33f
Ugo Yu [Tue, 21 May 2019 22:18:21 +0000 (15:18 -0700)]
Merge "Pairng: Fix crosskey paring" into qt-dev am:
079ebe2abe
am:
8f62c5c43a
Change-Id: Ibb5492bff50835f8b0bef70d86359b55d2622a24
Chienyuan [Tue, 21 May 2019 21:51:38 +0000 (14:51 -0700)]
Merge "QueueTest: UnregisterDequeue before promise set value" am:
569cc603b0 am:
5f0ae3bf42
am:
48069d852b
Change-Id: I179ccd157c6e61f56b47742685df8d9f66d64e17
Ugo Yu [Tue, 21 May 2019 20:46:09 +0000 (13:46 -0700)]
Merge "Pairng: Fix crosskey paring" into qt-dev
am:
079ebe2abe
Change-Id: I44e2c940fff402648aebd8044290fe6d5ace5bf8
Ugo Yu [Tue, 21 May 2019 20:18:35 +0000 (13:18 -0700)]
Merge "Pairng: Fix crosskey paring" into qt-dev
am:
079ebe2abe
Change-Id: I17d332aff290b362bb1e88613e99430d3b211ef7
TreeHugger Robot [Tue, 21 May 2019 18:40:52 +0000 (18:40 +0000)]
Merge "Pairng: Fix crosskey paring" into qt-dev
Chienyuan [Tue, 21 May 2019 17:16:40 +0000 (10:16 -0700)]
Merge "QueueTest: UnregisterDequeue before promise set value" am:
569cc603b0
am:
5f0ae3bf42
Change-Id: I9a8d586bfbc6681d8a08482c26df12a0ff4d3a00
Ugo Yu [Fri, 19 Apr 2019 09:40:38 +0000 (17:40 +0800)]
Pairng: Fix crosskey paring
* Send BONDING event to Java when static identity address is
first obtained during crosskey pairing
* Send BONDING event to Java for the initial random address
before send BONDED event
* Do not send bond event for static identity address when SDP is done.
* Make sure pairing control block always get cleaned up when both SDP
and pairing are done
* Send empty UUIDs to Java layer to unblock bonding intent broadcast
when SDP fails
Bug:
130553855
Fixes:
128518468
Test: pair between two dual mode phones, starting from SMP first to
trigger crosskey pairing
Change-Id: I56f3071595a6fb0cb5fe4df63eae33f8d4858141
Chienyuan [Tue, 21 May 2019 16:10:37 +0000 (09:10 -0700)]
Merge "QueueTest: UnregisterDequeue before promise set value"
am:
569cc603b0
Change-Id: I05e083c4f6ca40e93b015e8320742aa3a7181386
Treehugger Robot [Tue, 21 May 2019 15:45:42 +0000 (15:45 +0000)]
Merge "QueueTest: UnregisterDequeue before promise set value"
Weichin Weng [Mon, 20 May 2019 03:54:33 +0000 (20:54 -0700)]
Merge "Hearing Aid Dump Audio Tool: Add dump debug buffer feature" am:
45c9bb02a9 am:
ae6f2844ff
am:
8307af1ccc
Change-Id: I58a8174e899416b49334429affcd7c186080c61f
Weichin Weng [Mon, 20 May 2019 03:48:27 +0000 (20:48 -0700)]
Merge "Hearing Aid Dump Audio Tool: Add dump debug buffer feature" am:
45c9bb02a9
am:
ae6f2844ff
Change-Id: I4cc483586fefa5c5454d6225048b3395d77128da
Weichin Weng [Mon, 20 May 2019 03:44:22 +0000 (20:44 -0700)]
Merge "Hearing Aid Dump Audio Tool: Add dump debug buffer feature"
am:
45c9bb02a9
Change-Id: Ib2b58ae5ed347759bf59d2bea9e03060fd3ff1e1
Weichin Weng [Mon, 20 May 2019 03:38:04 +0000 (03:38 +0000)]
Merge "Hearing Aid Dump Audio Tool: Add dump debug buffer feature"
Myles Watson [Sat, 18 May 2019 02:51:17 +0000 (19:51 -0700)]
Merge "Remove Address dependency from PacketParserTest" am:
46512f1526 am:
b2e8494941
am:
5c99ade844
Change-Id: I75585b7c17e8f2c37044e38c3e3491466d17f014
Myles Watson [Sat, 18 May 2019 01:37:34 +0000 (18:37 -0700)]
Merge "Remove Address dependency from PacketParserTest" am:
46512f1526
am:
b2e8494941
Change-Id: Ia58aa629312788c35898997b8e10c6b1a8891592
Myles Watson [Sat, 18 May 2019 01:08:36 +0000 (18:08 -0700)]
Merge "Remove Address dependency from PacketParserTest"
am:
46512f1526
Change-Id: Iff97fcf52ecc8de81ba3bf5a9a4735073af6bbd3
Treehugger Robot [Sat, 18 May 2019 00:19:33 +0000 (00:19 +0000)]
Merge "Remove Address dependency from PacketParserTest"
Cheney Ni [Fri, 17 May 2019 23:21:49 +0000 (16:21 -0700)]
Merge "While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream" am:
ef34871622 am:
10d252f20a
am:
9a888ca449
Change-Id: Id1bb981a8432a28e7c42346fd97ab81cc3e315dc
Cheney Ni [Fri, 17 May 2019 22:44:22 +0000 (15:44 -0700)]
Merge "While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream" am:
ef34871622
am:
10d252f20a
Change-Id: I816d773ba61409ec0fe2fbfbf0e434ca82f5cc55
Cheney Ni [Fri, 17 May 2019 21:52:59 +0000 (14:52 -0700)]
Merge "While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream"
am:
ef34871622
Change-Id: I72f4d8301214c3fb3cd25f1be593a7bfdeebd917
Treehugger Robot [Fri, 17 May 2019 21:29:23 +0000 (21:29 +0000)]
Merge "While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream"
Haibo Huang [Fri, 17 May 2019 20:42:52 +0000 (13:42 -0700)]
Import ::testing::DoAll am:
1c360dc577 am:
d6e325fe4a
am:
219daea228
Change-Id: I02efdb0d4eb967deae6449e103c36af7cabb659b
Haibo Huang [Fri, 17 May 2019 20:18:10 +0000 (13:18 -0700)]
Import ::testing::DoAll am:
1c360dc577
am:
d6e325fe4a
Change-Id: Ic88539c48fd7ee18774936d78eb599a94fb82878
Haibo Huang [Fri, 17 May 2019 19:27:39 +0000 (12:27 -0700)]
Import ::testing::DoAll
am:
1c360dc577
Change-Id: I9ec0bcfc9c46d2ce45cf7ffd8ab46df62abf1836
Myles Watson [Fri, 17 May 2019 16:01:36 +0000 (09:01 -0700)]
Remove Address dependency from PacketParserTest
Test: bluetooth_packet_parser_test
Change-Id: I769e0ea2feacbc8c14598762f01746c76efe1079
weichinweng [Fri, 19 Apr 2019 09:27:32 +0000 (17:27 +0800)]
Hearing Aid Dump Audio Tool: Add dump debug buffer feature
Add dump HearingAid debug buffer feature to let the HearingAid debug
information dump to debug file and make it readable.
Bug:
130781854
Test: ./dump_hearingaid_audio.py -d true btsnoop_hci.log
./dump_hearingaid_audio.py -sd true btsnoop_hci.log
Change-Id: I150fd897e6f197d5b853554734926ad613de4e6b
Haibo Huang [Fri, 17 May 2019 04:59:01 +0000 (21:59 -0700)]
Import ::testing::DoAll
It is used in this file but didn't have corresponding using statement.
It fails compile in new googletest.
Test: build
Change-Id: I1ac9d04c1bc8c46b57ecfb7859ee0e3c31bbb092
Chienyuan [Fri, 17 May 2019 02:57:46 +0000 (10:57 +0800)]
QueueTest: UnregisterDequeue before promise set value
For some tests, ~Queue will() be trigger right after we get promise
we should UnregisterDequeue before promise set value to prevent
race condition
Test: atest bluetooth_test_gd
Change-Id: I9409b6829cce61ef95c766a1d3b3679197b8f9f4
Hansong Zhang [Fri, 17 May 2019 02:42:06 +0000 (19:42 -0700)]
Merge changes I2526f4bc,Iafe4a46d am:
55696dd72c am:
e0172b14c1
am:
a5c1e78222
Change-Id: Ibda42ab1fef1580534065fdd3af3da55d26ffb56
Hansong Zhang [Fri, 17 May 2019 01:20:07 +0000 (18:20 -0700)]
Merge changes I2526f4bc,Iafe4a46d am:
55696dd72c
am:
e0172b14c1
Change-Id: I35ae94d269311f67960a7c15979c0f259551f69d
Jakub Pawlowski [Fri, 17 May 2019 00:44:26 +0000 (17:44 -0700)]
Merge "crypto_toolbox: add const qualifiers to f4, f5, and f6 parameters" am:
fe02675de8 am:
1b0a882319
am:
fc20f5aeef
Change-Id: I71bbde85d595ef9ba0b2500111a50cdbf27f8675
Hansong Zhang [Fri, 17 May 2019 00:10:01 +0000 (17:10 -0700)]
Merge changes I2526f4bc,Iafe4a46d
am:
55696dd72c
Change-Id: Iee52bb52cd210cc3f353a37c968102022b213438
Treehugger Robot [Thu, 16 May 2019 22:48:06 +0000 (22:48 +0000)]
Merge changes I2526f4bc,Iafe4a46d
* changes:
Allow Handler synchronization in test code
Remove testing code from ModuleRegistry
Jakub Pawlowski [Thu, 16 May 2019 21:50:30 +0000 (14:50 -0700)]
Merge "crypto_toolbox: add const qualifiers to f4, f5, and f6 parameters" am:
fe02675de8
am:
1b0a882319
Change-Id: I5be83b4f021e0e2a0ec80f6abf4e25dbbdc13e10
Martin Brabham [Thu, 16 May 2019 20:43:13 +0000 (13:43 -0700)]
Merge "Add SMP PDL definition." am:
4b8f333982 am:
a4cc8e5769
am:
5fdc2a2446
Change-Id: Ic614648175602ac10299931abf764828b11c9f90
Jakub Pawlowski [Thu, 16 May 2019 20:37:13 +0000 (13:37 -0700)]
Merge "crypto_toolbox: add const qualifiers to f4, f5, and f6 parameters"
am:
fe02675de8
Change-Id: I9f7c445718ef3a2f54a019a6f4a87c8ba94cfb9d
Jakub Pawlowski [Thu, 16 May 2019 20:35:03 +0000 (13:35 -0700)]
Make AES control block into a thread local variable am:
59942e1b9a am:
57cfda268b
am:
cd17854b30
Change-Id: I6b3b7a8ca9c0ab4bfae5b2bdf5ff7d2e2c96be5e
Jakub Pawlowski [Thu, 16 May 2019 19:42:35 +0000 (19:42 +0000)]
Merge "crypto_toolbox: add const qualifiers to f4, f5, and f6 parameters"
Martin Brabham [Thu, 16 May 2019 18:50:33 +0000 (11:50 -0700)]
Merge "Add SMP PDL definition." am:
4b8f333982
am:
a4cc8e5769
Change-Id: Ib02f65d5f40bafecc52bd9980d01e5b3ad7af60c
Jakub Pawlowski [Thu, 16 May 2019 18:49:25 +0000 (11:49 -0700)]
Make AES control block into a thread local variable am:
59942e1b9a
am:
57cfda268b
Change-Id: I95aad39117db976118d8149f687983da8c40fa7b
Martin Brabham [Thu, 16 May 2019 18:21:58 +0000 (11:21 -0700)]
Merge "Add SMP PDL definition."
am:
4b8f333982
Change-Id: I0e6a985c210717d9a93a269aa67ac359f273df2c
Jakub Pawlowski [Thu, 16 May 2019 18:20:55 +0000 (11:20 -0700)]
Make AES control block into a thread local variable
am:
59942e1b9a
Change-Id: Ib09ebcdac90e0203fa15bd1044ff85cea25efa18
Treehugger Robot [Thu, 16 May 2019 17:48:15 +0000 (17:48 +0000)]
Merge "Add SMP PDL definition."
Martin Brabham [Thu, 16 May 2019 16:36:10 +0000 (09:36 -0700)]
Add SMP PDL definition.
Bug:
132863815
Test: N/A
Change-Id: I5d762432be133a264db1f9b9de74acad2c60b429
Martin Brabham [Thu, 16 May 2019 12:47:23 +0000 (05:47 -0700)]
NIAP: Add a new argument to determine single user mode status. am:
1a88ace397
am:
a1ed75289d
Change-Id: Ib2a49f7f5cfed27d2591639ca0fde9325464ec63
Martin Brabham [Thu, 16 May 2019 12:47:04 +0000 (05:47 -0700)]
Revert "btif: Short circuit NIAP key attestation check" am:
1a275856ab
am:
ed3abe2942
Change-Id: I600b734e3a8bea87c0dfc7cda2cd55d04143e8a5
Xin Li [Thu, 16 May 2019 12:46:32 +0000 (05:46 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master" into stage-aosp-master am:
cd463e2f54 -s ours
am:
f3727c193b
Change-Id: Id88fb94da998f8e97de17832f94d0a519bb3f7ba
Jakub Pawlowski [Thu, 16 May 2019 10:55:08 +0000 (12:55 +0200)]
crypto_toolbox: add const qualifiers to f4, f5, and f6 parameters
Bug:
132863815
Change-Id: I58de98b9087c81a27054eb8302212a1bf0595093
Jakub Pawlowski [Thu, 16 May 2019 10:34:06 +0000 (12:34 +0200)]
Make AES control block into a thread local variable
When computing ACES-CMAC, we use static control block that's shared
between multiple threads. That means that having computation done in
different threads can interfere and cause bad value to be returned.
This patch fixes that by making the control block into thread local
variable.
Bug:
132863815
Change-Id: Ibe2aaac54b93f77d644564d23694846c0c078bd6
Xin Li [Thu, 16 May 2019 09:54:12 +0000 (02:54 -0700)]
[automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master am:
10b627bb35 -s ours
am:
68b2d3ff56
Change-Id: Ic3a6f3cc008a29dc389cbdc72b83b5bed9475886
Android Build Merger (Role) [Thu, 16 May 2019 07:41:31 +0000 (07:41 +0000)]
Merge "Merge "L2CAP: Always use SUCCESS" am:
f256ea9c02 am:
d4ff4d3644 am:
a40291dd16" into qt-r1-dev-plus-aosp
Myles Watson [Thu, 16 May 2019 07:41:20 +0000 (00:41 -0700)]
Merge "L2CAP: Always use SUCCESS" am:
f256ea9c02 am:
d4ff4d3644
am:
a40291dd16
Change-Id: Iaef4bc88a26f954afcc39d42f7f405fd4a5d4b4d
Martin Brabham [Thu, 16 May 2019 04:17:22 +0000 (21:17 -0700)]
NIAP: Add a new argument to determine single user mode status. am:
1a88ace397
am:
ef54ef8e3a
Change-Id: Id45a1b138b90164a5b33002adb5023d6165da812
Martin Brabham [Thu, 16 May 2019 04:17:03 +0000 (21:17 -0700)]
Revert "btif: Short circuit NIAP key attestation check" am:
1a275856ab
am:
1c2634d973
Change-Id: Ie2ca69bf230a444e49c6ce0d8ab5f45250e88a82
Martin Brabham [Thu, 16 May 2019 03:47:36 +0000 (20:47 -0700)]
NIAP: Add a new argument to determine single user mode status.
am:
1a88ace397
Change-Id: Ie2866d3a9a83a766fed52e2974fbfd08306536ef
Martin Brabham [Thu, 16 May 2019 03:47:23 +0000 (20:47 -0700)]
Revert "btif: Short circuit NIAP key attestation check"
am:
1a275856ab
Change-Id: I4ff7b873c77f38c6f2127bb34582fe6bde2f433e
Martin Brabham [Thu, 16 May 2019 03:17:46 +0000 (20:17 -0700)]
NIAP: Add a new argument to determine single user mode status.
am:
1a88ace397
Change-Id: Ic11ae11c2101131880701812eec4380e98e8226a
Martin Brabham [Thu, 16 May 2019 03:17:32 +0000 (20:17 -0700)]
Revert "btif: Short circuit NIAP key attestation check"
am:
1a275856ab
Change-Id: I310fbe186ef01ad39a49665577e49d1df3137374
Xin Li [Thu, 16 May 2019 02:08:00 +0000 (19:08 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master" into stage-aosp-master
am:
cd463e2f54 -s ours
am skip reason: subject contains skip directive
Change-Id: I440c8f34f479aa2551c9284feb6992c49c6e83e7
Xin Li [Thu, 16 May 2019 00:44:12 +0000 (17:44 -0700)]
[automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master
am:
10b627bb35 -s ours
am skip reason: subject contains skip directive
Change-Id: Id9a1659cea359458dab5ecd1b03ab6bbd5a5009b
Martin Brabham [Fri, 10 May 2019 19:42:15 +0000 (12:42 -0700)]
NIAP: Add a new argument to determine single user mode status.
This is being used to section off the feature to single user mode
devices as provisioned devices requiring compliance will be
single user mode only. This is a stop-gap waiting on a vendor code fix.
RE keystore (qseecom) problems: b/
129759834
Bug: b/
117993149
Test: atest net_test_bluetooth
Change-Id: I4fb3f4e663a051db8f8ba12901a20fa18ebf197e
Myles Watson [Wed, 15 May 2019 23:54:10 +0000 (16:54 -0700)]
Require a semicolon after ASSERT am:
49496a3d06 am:
546d2fc915
am:
9733470865
Change-Id: Ia8ffcbb3e288eec29b5c9116a33fc6f34ff82383
TreeHugger Robot [Wed, 15 May 2019 23:02:12 +0000 (23:02 +0000)]
Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master" into stage-aosp-master
Myles Watson [Wed, 15 May 2019 20:32:15 +0000 (13:32 -0700)]
Merge "L2CAP: Always use SUCCESS" am:
f256ea9c02
am:
d4ff4d3644
Change-Id: I4567e2a3cc352ca30bab270599cb574072d02ecd
Myles Watson [Wed, 15 May 2019 20:24:00 +0000 (13:24 -0700)]
Merge "L2CAP: Always use SUCCESS"
am:
f256ea9c02
Change-Id: If78bace42679e10a74b8b3df98feda1970e29450
Treehugger Robot [Wed, 15 May 2019 20:00:38 +0000 (20:00 +0000)]
Merge "L2CAP: Always use SUCCESS"
Martin Brabham [Mon, 22 Apr 2019 18:26:02 +0000 (11:26 -0700)]
Revert "btif: Short circuit NIAP key attestation check"
This reverts commit
24200b230ab9c5dec4f3f10a4b36cf7f84515e05.
Bug:
117993149
Myles Watson [Wed, 15 May 2019 18:31:23 +0000 (11:31 -0700)]
Require a semicolon after ASSERT am:
49496a3d06
am:
546d2fc915
Change-Id: I30d37346f96649d6a14628af725ddbb73bfd9e8e
Myles Watson [Wed, 15 May 2019 18:26:17 +0000 (11:26 -0700)]
Require a semicolon after ASSERT
am:
49496a3d06
Change-Id: I15734a820b5a67733babd0aae0263f8f97edc508
Myles Watson [Tue, 14 May 2019 21:11:55 +0000 (14:11 -0700)]
Require a semicolon after ASSERT
Test: atest --host bluetooth_test_gd
Change-Id: I304d097f6094eecdad04d99c9397475b4721115c
Myles Watson [Wed, 15 May 2019 14:18:18 +0000 (07:18 -0700)]
L2CAP: Always use SUCCESS
Test: bluetooth_test_gd --gtest_filter=*L2*
Change-Id: I6070168e2d9055b6d7f54726a773ab646dcb567c
Hansong Zhang [Thu, 9 May 2019 23:40:37 +0000 (16:40 -0700)]
Allow Handler synchronization in test code
SynchronizeModuleHandler() blocks until all previous closures are done.
Test: atest bluetooth_test_gd --host
Change-Id: I2526f4bc1c5ce485ceaedbd0cb744a98b928518b
OSDN Git Service
