Commit graph

6307 commits

Author SHA1 Message Date
Justin Yun
d66371512c Update make file for vndk enabled.
am: 608d773ef8

Change-Id: I6ea2891c61edaa2f8e1657544e3d2fb5011626c8
2017-08-05 02:10:40 +00:00
Tri Vo
4fdb18759b Merge "Wifi supplicant test statically links to dependencies." into oc-mr1-dev
am: c0d5b9bbb8

Change-Id: I1c2a9dfe36fdd47c81b7e405adb60383e6257a1c
2017-08-04 23:15:43 +00:00
Tri Vo
c0d5b9bbb8 Merge "Wifi supplicant test statically links to dependencies." into oc-mr1-dev 2017-08-04 23:07:26 +00:00
Steven Moreland
b0d221b5f2 [AWARE] Fix validity check on PMK + export PASSPHRASE lengths am: 5434abe394 -s ours am: 7d7673231a -s ours
am: 48be422950  -s ours

Change-Id: I8c69365fad55c32d0482b4d2e82db14678086cfc
2017-08-04 21:32:15 +00:00
Steven Moreland
f99b82b767 [AWARE] Fix validity check on PMK + export PASSPHRASE lengths am: 41fbb48fb9 -s ours
am: 7891d628e9  -s ours

Change-Id: Iad04d784d4915be32c82dbb79f488b305ecf6fde
2017-08-04 21:32:01 +00:00
Steven Moreland
48be422950 [AWARE] Fix validity check on PMK + export PASSPHRASE lengths am: 5434abe394 -s ours
am: 7d7673231a  -s ours

Change-Id: I83a278d50e34cbf3e19e5689cccb624f4e7dd11d
2017-08-04 21:26:16 +00:00
Steven Moreland
7891d628e9 [AWARE] Fix validity check on PMK + export PASSPHRASE lengths
am: 41fbb48fb9  -s ours

Change-Id: I6e019649b1cf4413bfe848f63571386f8afea984
2017-08-04 21:26:00 +00:00
Tomasz Wasilczyk
c4569f777d Merge "Pass vendor-specific info as map." into oc-mr1-dev
am: c2342f170d

Change-Id: I1fa708806b962e8bd1d65150e838b3731b803892
2017-08-04 21:23:47 +00:00
Steven Moreland
7d7673231a [AWARE] Fix validity check on PMK + export PASSPHRASE lengths
am: 5434abe394  -s ours

Change-Id: I80dce4c15f0945387400c12d49e61e39d3a1091b
2017-08-04 21:20:33 +00:00
Steven Moreland
41fbb48fb9 [AWARE] Fix validity check on PMK + export PASSPHRASE lengths
Bug: 62376042
Test: unit tests + integrated (sl4a) tests
Test: hidl-gen -L check android.hardware.wifi@1.0
Merged-In: I4c0e19a21a268fe7f2d38e82f3743ac5a8e2c6cb
Change-Id: I90f6f64d587331ad16538291b82ffa1b50fe5e0c
2017-08-04 14:17:28 -07:00
Tomasz Wasilczyk
c2342f170d Merge "Pass vendor-specific info as map." into oc-mr1-dev 2017-08-04 21:12:15 +00:00
Steven Moreland
5434abe394 [AWARE] Fix validity check on PMK + export PASSPHRASE lengths
Bug: 62376042
Test: unit tests + integrated (sl4a) tests
Test: hidl-gen -L check android.hardware.wifi@1.0
Merged-In: I4c0e19a21a268fe7f2d38e82f3743ac5a8e2c6cb
Change-Id: I90f6f64d587331ad16538291b82ffa1b50fe5e0c
2017-08-04 21:05:23 +00:00
Steve Paik
d02223d4f6 Merge "Implement comments from API review" into oc-mr1-dev
am: 3bb18be633

Change-Id: Iffceee62b2940d13916dffb03df2825d7e1a5965
2017-08-04 20:58:02 +00:00
TreeHugger Robot
3bb18be633 Merge "Implement comments from API review" into oc-mr1-dev 2017-08-04 20:40:34 +00:00
Steven Moreland
c94a28bcd3 Merge changes from topic 'go-away-static-hidl-java' am: f4c58cd48c am: 4e06dd1aa9 am: 92a268afa3 -s ours
am: 8ebd805421

Change-Id: I51450d809a82d009671af1ff7418681f43fc9751
2017-08-04 19:58:03 +00:00
Steven Moreland
8ebd805421 Merge changes from topic 'go-away-static-hidl-java' am: f4c58cd48c am: 4e06dd1aa9
am: 92a268afa3  -s ours

Change-Id: I8d99aa0e9c58ebcbf9d6db63c15ff7b6c0b9a611
2017-08-04 19:45:31 +00:00
Steven Moreland
92a268afa3 Merge changes from topic 'go-away-static-hidl-java' am: f4c58cd48c
am: 4e06dd1aa9

Change-Id: I3e381dd323532e4092fe836f18206e0d23a030d1
2017-08-04 19:33:23 +00:00
Steven Moreland
4e06dd1aa9 Merge changes from topic 'go-away-static-hidl-java'
am: f4c58cd48c

Change-Id: I3502ad1d51868cd82bbe811bdf2b96ec45ccfbe6
2017-08-04 19:22:05 +00:00
Steven Moreland
f4c58cd48c Merge changes from topic 'go-away-static-hidl-java'
* changes:
  Update makefiles.
  Add an empty 1.1 ISap interface.
  [AWARE] Fix validity check on PMK + export PASSPHRASE lengths
2017-08-04 19:14:48 +00:00
Tri Vo
48f8e5d6be Wifi supplicant test statically links to dependencies.
This test now statically links to libs not guaranteed to be on the
device.

Bug: 64040096
Test: compiles
Change-Id: I986e61835e641e15bdad0ff9571ee8ffa59b2a46
2017-08-04 10:36:10 -07:00
Justin Yun
608d773ef8 Update make file for vndk enabled.
Update the Android.bp generated with hidl-gen.

Test: build with and without BOARD_VNDK_VERSION=current
Bug: 63866913
Change-Id: I1a9db1df49e0f13c5790da2b118ae9ec63ba34a7
2017-08-04 14:12:23 +09:00
Steve Paik
ec73701e4c Implement comments from API review
Bug:  64372008
Test:  Fix comments
Change-Id: Ia2bc0ae4c45015e7965b544f5d46f7e2a3ff0e2a
2017-08-03 19:36:29 -07:00
Tomasz Wasilczyk
fa3a559d86 Pass vendor-specific info as map.
This solves a problem of identifying, if a given application is talking
to a hardware that can handle format of these strings.

Bug: b/64229617
Test: VTS, instrumentation
Change-Id: If1a5f9900800b8537ef158beefcbaf3c1008c3da
2017-08-03 18:21:47 -07:00
Steven Moreland
a7a300a13b Merge "Update makefiles for vndk enabled." into oc-mr1-dev
am: d9b12c13e5

Change-Id: Id70e58e6b4d20dada4aab107b2aa98c58cf167ca
2017-08-04 01:04:40 +00:00
TreeHugger Robot
d9b12c13e5 Merge "Update makefiles for vndk enabled." into oc-mr1-dev 2017-08-04 00:52:06 +00:00
Tomasz Wasilczyk
d79175855d Merge "Implement missing broadcastradio 1.1 VTS tests." into oc-mr1-dev
am: 9da1f3be59

Change-Id: I8f17dd871aea62eab2f7fa498cc1eea7e0d56d6a
2017-08-04 00:19:05 +00:00
Tomasz Wasilczyk
9da1f3be59 Merge "Implement missing broadcastradio 1.1 VTS tests." into oc-mr1-dev 2017-08-04 00:11:02 +00:00
Shuo Qian
3f9edfa9fe Merge "Add vts test for setCarrierInfoForImsiEncryption" am: afcdb1effb am: d4c6c7b703 am: b08d3972fa -s ours
am: 6d188affde  -s ours

Change-Id: I5de574484b633ebbb53011ed38d9c742353ddc40
2017-08-03 23:33:33 +00:00
Shuo Qian
6d188affde Merge "Add vts test for setCarrierInfoForImsiEncryption" am: afcdb1effb am: d4c6c7b703
am: b08d3972fa  -s ours

Change-Id: I768f9aafa5a1a4618bb91fffdcab1f587919372d
2017-08-03 23:28:21 +00:00
Shuo Qian
b08d3972fa Merge "Add vts test for setCarrierInfoForImsiEncryption" am: afcdb1effb
am: d4c6c7b703

Change-Id: I83091fa9a0374478a6a0c69a3787cb061967f257
2017-08-03 23:23:16 +00:00
Shuo Qian
d4c6c7b703 Merge "Add vts test for setCarrierInfoForImsiEncryption"
am: afcdb1effb

Change-Id: I08ab4ff325457ee5242060a5b40e56ce0c227ad4
2017-08-03 23:17:33 +00:00
Shuo Qian
afcdb1effb Merge "Add vts test for setCarrierInfoForImsiEncryption" 2017-08-03 23:08:14 +00:00
Tri Vo
bfc99d6203 Merge "VTS tests now static link to HAL def libs." into oc-mr1-dev
am: f227b7218e  -s ours

Change-Id: I17bd94465b9c5472a7b364fc980d6f3e8240c818
2017-08-03 23:06:32 +00:00
TreeHugger Robot
f227b7218e Merge "VTS tests now static link to HAL def libs." into oc-mr1-dev 2017-08-03 22:57:50 +00:00
Tri Vo
63c2f5c653 Merge "Add cc_defaults VtsHalTargetTestDefaults" into oc-mr1-dev
am: d182bb10e0  -s ours

Change-Id: Ic816a36a9b47683625252d02098b11a86a6fd1ad
2017-08-03 22:38:29 +00:00
TreeHugger Robot
d182bb10e0 Merge "Add cc_defaults VtsHalTargetTestDefaults" into oc-mr1-dev 2017-08-03 22:29:24 +00:00
Steven Moreland
b5da32c177 Update makefiles.
Removes redundant "java-static" target.

Note, targets aren't removed here which have internal
targets that depend on them.

Bug: 36376126
Test: pass
Change-Id: I830f02e5f219d2d58721132c358d2783c3942eac
2017-08-03 15:25:21 -07:00
Amit Mahajan
1e2bd45f3f Add an empty 1.1 ISap interface.
This is needed since manifest doesn't support different versions
for different interfaces in a package. Since there's a 1.1 for
IRadio, there needs to be a 1.1 for ISap as well.

Test: build
Bug: 63598469
Bug: 62371412
Change-Id: I7537b0074f772fab4a26d4ed97d346610784eeac
Merged-In: I9a0bd898e5d236f05d6574b3e3093521d0f57d52
2017-08-03 15:20:29 -07:00
Etan Cohen
e2cc4c4f80 [AWARE] Fix validity check on PMK + export PASSPHRASE lengths
Bug: 62376042
Bug: 36376126
Test: unit tests + integrated (sl4a) tests
Change-Id: I90de33a36bdfdd746710b0c5b0e25458fe3c06c7
Merged-In: I4c0e19a21a268fe7f2d38e82f3743ac5a8e2c6cb
2017-08-03 15:20:24 -07:00
Enrico Granata
8e5a8d5d0d Merge "Fix a typo in one of the OBD2 ignition monitors" into oc-mr1-dev
am: 72c691df3c

Change-Id: I62b839cd981f8b75a60c8008c1667e10f89446aa
2017-08-03 22:04:54 +00:00
TreeHugger Robot
72c691df3c Merge "Fix a typo in one of the OBD2 ignition monitors" into oc-mr1-dev 2017-08-03 21:58:52 +00:00
Tri Vo
c7d816b680 Merge changes from topic 'vts_deps' am: 7d149a564f am: 7f8774ef80 am: 3b84dc5c78
am: 84d1627979

Change-Id: I809807a17187a401c396cd73721ca9fdccc60f1c
2017-08-03 20:34:21 +00:00
Tri Vo
35c7bd2e2b VTS tests now static link to HAL def libs.
And use VtsHalTargetTestDefaults.

Bug: 64040096
Test: compiles
Merged-In: I3cfb1a64f6abcf3145337a736800b72d92a0b152
Change-Id: I3cfb1a64f6abcf3145337a736800b72d92a0b152
(cherry picked from commit 6c2bd86f70)
2017-08-03 13:28:08 -07:00
Tri Vo
84d1627979 Merge changes from topic 'vts_deps' am: 7d149a564f am: 7f8774ef80
am: 3b84dc5c78

Change-Id: I00c00e9e48d0275a78fb8914fdbc85de10b0d060
2017-08-03 20:27:47 +00:00
Tri Vo
f7c2fbc1a8 Add cc_defaults VtsHalTargetTestDefaults
Makes it easier to control how vts tests link to system libs.
Also, removes a lot of redundant lines in test make rules.

Bug: 64040096
Test: compiles
Merged-In: I10796e3fa8f61a307dbb7edace537a96ec83bea7
Change-Id: I10796e3fa8f61a307dbb7edace537a96ec83bea7
(cherry picked from commit 0b19836cea)
2017-08-03 13:27:33 -07:00
Tri Vo
3b84dc5c78 Merge changes from topic 'vts_deps' am: 7d149a564f
am: 7f8774ef80

Change-Id: Ieb521a2e25f9483d68d33a8c9d4b2d957da978c7
2017-08-03 20:21:47 +00:00
Tri Vo
7f8774ef80 Merge changes from topic 'vts_deps'
am: 7d149a564f

Change-Id: Idf236b741d7ff2cc529002218c34a3b4f0cf625c
2017-08-03 20:15:19 +00:00
Treehugger Robot
7d149a564f Merge changes from topic 'vts_deps'
* changes:
  VTS tests now static link to HAL def libs.
  Add cc_defaults VtsHalTargetTestDefaults
2017-08-03 20:06:15 +00:00
Tomasz Wasilczyk
dd58770c39 Implement missing broadcastradio 1.1 VTS tests.
Bug: b/36864490
Test: VTS
Change-Id: Iff25fdd65624db09e6667d32108e479d5eee6964
2017-08-03 12:59:12 -07:00
Ruchi Kandoi
e53d04b2ec Merge "nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0 am: 029633dcd0 am: 781ce91bcd" into oc-dr1-dev-plus-aosp
am: 711f0ffcbf

Change-Id: I59454a3f14705430c79bb93027839732fd16115a
2017-08-03 19:21:55 +00:00