Commit graph

1283 commits

Author SHA1 Message Date
Subhani Shaik
b600992ac7 [AWARE]: Add support for NAN qos config, schedule update channel
Add qos config parameter in sdea control parameters and also
add schedule update channel as part of nan sync stats.

Change-Id: I8b56bf49dc3b0a7139a1bfd8698114f0fbf2fd16
2017-12-12 16:17:02 -08:00
Chih-hung Hsieh
67b598c76d Merge "Use -Werror in hardware/libhardware_legacy" am: 8087f07a2b am: a35e4c72b1 am: 6817e3fa13
am: ccc1d81bbe

Change-Id: I4fe70d00d2d1b5c33563a80700a11568be539420
2017-10-12 03:13:41 +00:00
Chih-hung Hsieh
ccc1d81bbe Merge "Use -Werror in hardware/libhardware_legacy" am: 8087f07a2b am: a35e4c72b1
am: 6817e3fa13

Change-Id: I1dc39bea1a185e6e5c25205c0282bcc4e0da5429
2017-10-12 01:58:47 +00:00
Chih-hung Hsieh
6817e3fa13 Merge "Use -Werror in hardware/libhardware_legacy" am: 8087f07a2b
am: a35e4c72b1

Change-Id: I8f18572a9df2cbcea8a837b7f48bdb93ffee4dd9
2017-10-12 01:35:37 +00:00
Chih-hung Hsieh
a35e4c72b1 Merge "Use -Werror in hardware/libhardware_legacy"
am: 8087f07a2b

Change-Id: Iaf79e2ae121bda6d13b05b53d809453771040a3d
2017-10-12 01:28:00 +00:00
Chih-hung Hsieh
8087f07a2b Merge "Use -Werror in hardware/libhardware_legacy" 2017-10-12 00:53:24 +00:00
Chih-Hung Hsieh
3ba7298e95 Use -Werror in hardware/libhardware_legacy
* Remove unused local variable or suppress the warning.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I4d7b4f2e9e7e6c60d8bfc209f47e6f1d33720165
2017-10-03 13:38:46 -07:00
Justin Yun
a211035d88 Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 53401d7c35 am: 9b7fbccdb4 am: 8f54321751 -s ours
am: 51106ccf98  -s ours

Change-Id: I040adff97163613a0b2f661a34bb5718b9dfaeb8
2017-09-14 06:33:38 +00:00
Justin Yun
51106ccf98 Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 53401d7c35 am: 9b7fbccdb4
am: 8f54321751  -s ours

Change-Id: I09c8fc53049573573353c9960e385a86e704498a
2017-09-14 06:04:43 +00:00
Justin Yun
8f54321751 Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 53401d7c35
am: 9b7fbccdb4

Change-Id: Iefb1438bf398a6d8c6c7fd3c1ba2b980f51b96fa
2017-09-14 05:48:37 +00:00
Justin Yun
9b7fbccdb4 Merge "Mark the module as VNDK or VNDK-SP in Android.bp"
am: 53401d7c35

Change-Id: Ib83b45cb3a9f72e83bb6a38d1e471527841e85f1
2017-09-14 05:34:56 +00:00
Treehugger Robot
53401d7c35 Merge "Mark the module as VNDK or VNDK-SP in Android.bp" 2017-09-14 01:38:04 +00:00
Justin Yun
39b86dd6ba Mark the module as VNDK or VNDK-SP in Android.bp
As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well
as 'vendor_available: true'.

For a VNDK module, the 'vndk' tag has 'enabled: true'.
It will be installed system/lib(64)/vndk as a vendor variant.

For a VNDK-SP module, the 'vndk' tag has
'support_system_process: true' as well as 'enabled: true'.
It will be installed system/lib(64)/vndk-sp as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Merged-In: I9b9d9c0a3f33e396e71167c055220b55380eb1b5
Change-Id: I9b9d9c0a3f33e396e71167c055220b55380eb1b5
(cherry picked from commit 5bed6372b8)
2017-09-07 05:55:06 +00:00
Ivan Lozano
738437d93c Do not include the IAudioFlinger.h header.
This header does not look like it is used anymore, and compilation
succeeds without it, so it seems safe to remove.

Bug: 64223827
Test: 'mma -j4' throws no compilation errors.
Change-Id: Ic7ca90a7ba576d0ae14ee95d2d20c8ddf612754a
2017-08-08 13:35:10 -07:00
Justin Yun
eeffd564c1 Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev am: ab21b93dec
am: b91071601b

Change-Id: I319c3c4fee38cd8531c110157fc623f813ae8053
2017-08-03 06:03:37 +00:00
Justin Yun
b91071601b Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev
am: ab21b93dec

Change-Id: Iffc0701e60aa832e994d92b0ff426640a9555847
2017-08-03 05:57:39 +00:00
TreeHugger Robot
ab21b93dec Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev 2017-08-03 05:49:40 +00:00
Subhani Shaik
08571f6b51 Merge "SAR: Modify tx power API am: cea38b3bba am: 5db6c1cd24" into oc-mr1-dev-plus-aosp
am: a645562473

Change-Id: I327001eb3b25bb5ea390d82d8f70d25ac0c6487d
2017-07-28 03:15:34 +00:00
Subhani Shaik
92df4286c1 SAR: Modify tx power API am: cea38b3bba am: de3f6adf54
am: 5331fefc12

Change-Id: Id93b7f47b1b9fee269e352749d12e50b7e32250f
2017-07-28 03:08:32 +00:00
Android Build Merger (Role)
a645562473 Merge "SAR: Modify tx power API am: cea38b3bba am: 5db6c1cd24" into oc-mr1-dev-plus-aosp 2017-07-28 03:04:24 +00:00
Subhani Shaik
405dec5d7f SAR: Modify tx power API am: cea38b3bba
am: 5db6c1cd24

Change-Id: Ic6c610446eb335f8fa19585fb148dbc316971740
2017-07-28 03:00:38 +00:00
Subhani Shaik
5331fefc12 SAR: Modify tx power API am: cea38b3bba
am: de3f6adf54

Change-Id: Ie41c8169e51603ed3179db4292c139553275a535
2017-07-28 02:59:22 +00:00
Subhani Shaik
de3f6adf54 SAR: Modify tx power API
am: cea38b3bba

Change-Id: I9620ad96ebf06fd30d2b330a9f01fccf823a6494
2017-07-28 02:52:00 +00:00
Subhani Shaik
5db6c1cd24 SAR: Modify tx power API
am: cea38b3bba

Change-Id: Iadc65e47e593f33eb0168816011635469c54d32a
2017-07-28 02:51:59 +00:00
Subhani Shaik
cea38b3bba SAR: Modify tx power API
Modify the current tx power API to select predefined power settings
and apply the same from the BDF file.

Bug: 62437848
Test: Manual tests
Change-Id: Ia8a4c2c3ebbc055fc28cbee224ff685f97589a08
(cherry-picked from 674da97c8fbc40b9e9b7f80bb86c4f0824fa9d7a)
2017-07-25 11:25:52 -07:00
Justin Yun
5bed6372b8 Mark the module as VNDK or VNDK-SP in Android.bp
As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well
as 'vendor_available: true'.

For a VNDK module, the 'vndk' tag has 'enabled: true'.
It will be installed system/lib(64)/vndk as a vendor variant.

For a VNDK-SP module, the 'vndk' tag has
'support_system_process: true' as well as 'enabled: true'.
It will be installed system/lib(64)/vndk-sp as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: I9b9d9c0a3f33e396e71167c055220b55380eb1b5
2017-07-25 14:44:58 +09:00
Subhani Shaik
e586a1b769 SAR: Enable API to configure SAR am: d6a6047351
am: 2ed03c0066

Change-Id: I6d7378ed31b223634b0c147d59d5939e234c3b1f
2017-07-11 21:40:27 +00:00
Subhani Shaik
2ed03c0066 SAR: Enable API to configure SAR
am: d6a6047351

Change-Id: I137863f1aa7a7bfabfac2396ea57665a2e9f1dcc
2017-07-11 21:36:36 +00:00
Subhani Shaik
d6a6047351 SAR: Enable API to configure SAR
Bug: 62437848
Test: Compiles
Change-Id: Iebe6dd8af9cedb295b5bd0beaff5c32dc58a038f
(cherry-picked from f66e31d017f9f9b3adc63e79de7a3ac067a62202)
2017-07-11 07:37:00 -07:00
Steven Moreland
4c024bb0e5 Merge "libhardware_legacy: vendor_available" am: 483a68f68a am: 32e427d64d -s ours am: 78c1981b8a -s ours
am: 464d7d8fdb  -s ours

Change-Id: I4a55b00a4fdbe0faf388264cf5aa858423b2f73f
2017-06-16 00:56:20 +00:00
Steven Moreland
464d7d8fdb Merge "libhardware_legacy: vendor_available" am: 483a68f68a am: 32e427d64d -s ours
am: 78c1981b8a  -s ours

Change-Id: I90d35976ccd3e6947eddece5eef86bea8a8a9398
2017-06-16 00:53:21 +00:00
Steven Moreland
78c1981b8a Merge "libhardware_legacy: vendor_available" am: 483a68f68a
am: 32e427d64d  -s ours

Change-Id: I74be36cfc5d9712d2580b547bb4c2550132d0116
2017-06-16 00:49:49 +00:00
Steven Moreland
32e427d64d Merge "libhardware_legacy: vendor_available"
am: 483a68f68a

Change-Id: I94f569da3191d3e7ea04710f885b97fae5cda4b1
2017-06-16 00:46:20 +00:00
Treehugger Robot
483a68f68a Merge "libhardware_legacy: vendor_available" 2017-06-16 00:39:29 +00:00
Steven Moreland
5ed882978a libhardware_legacy: vendor_available
Test: build with BOARD_VNDK_VERSION := current
Merged-In: Iccc3a0301a28de52fc17102d251ce728d372ba5c
Change-Id: Iccc3a0301a28de52fc17102d251ce728d372ba5c
(cherry picked from commit 477e5978ac)
2017-06-14 19:42:31 +09:00
Subhani Shaik
22dcefe8a6 AWARE: Fix rssi_window_size length in config
Bug: 38321768
Test: AttachTest:test_attach_multiple_sessions bad TLV issue resolved
Change-Id: Id9f4a2124a394cf3c44c6eb7560400a0fd690f31
2017-05-22 16:07:15 -07:00
Etan Cohen
d665d7b5bc Merge "[AWARE]: Add support for configuring NAN sid on subscriber side" 2017-04-20 21:55:49 +00:00
Rakesh Sunki
6451ba7735 [AWARE]: Add support for configuring NAN sid on subscriber side
Provide configuration support to set sid on the subscriber side sync and
discovery beacons as part of NAN enable and config request.

(cherry-pick of commit b2c4b3825a5b1ef4713417538755b04225b2b53d)

Bug: 35195516
Test: integrated (sl4a) tests pass
Change-Id: I20548928a9ad81e8d3154eb5b982fd19add7659c
2017-04-20 12:47:34 -07:00
Colin Cross
6640207e83 Merge changes Ic355174a,I8b04ba9e,I3fefb13c am: dd67435bac am: 29745f29b8 am: 1e2b77935c -s ours
am: f4ef49163b

Change-Id: I7a30ca484a9037d3ed97abb40adc948f0246b8b2
2017-04-20 18:51:25 +00:00
Roshan Pius
0366ae7efd Merge "Fix static_assert compile issue" am: 9845354ef7 am: 6b3c4365b6 am: fa72bc1b48
am: 45391d1b76

Change-Id: I4449e6e5e6c93fb71547e7c7ba1fd54479c4a6f6
2017-04-20 18:51:13 +00:00
Dan Willemsen
9cba24de39 Merge "Mark as vendor_available" am: 39a2e208fa am: c985524d71 am: 5465ba3b98 -s ours
am: 206731be50

Change-Id: Ied184b1e3d957ab6d2f53c313a4d35a8742f39d5
2017-04-20 15:54:42 +00:00
Colin Cross
f4ef49163b Merge changes Ic355174a,I8b04ba9e,I3fefb13c am: dd67435bac am: 29745f29b8
am: 1e2b77935c  -s ours

Change-Id: I008e7194d75413748b31977e289c00065de6d67f
2017-04-20 15:45:19 +00:00
Colin Cross
1e2b77935c Merge changes Ic355174a,I8b04ba9e,I3fefb13c am: dd67435bac
am: 29745f29b8

Change-Id: I31e6b092149c3fabe7715277a43e611f3f96648e
2017-04-20 15:16:05 +00:00
Colin Cross
29745f29b8 Merge changes Ic355174a,I8b04ba9e,I3fefb13c
am: dd67435bac

Change-Id: I6a48a4e5d3b0c5cf7ef7a8f808602038979f62af
2017-04-20 15:12:47 +00:00
Colin Cross
dd67435bac Merge changes Ic355174a,I8b04ba9e,I3fefb13c
* changes:
  libhardware_legacy: Android.mk -> Android.bp
  remove legacy audio policy
  libhardware_legacy doesn't need libmedia
2017-04-20 15:06:52 +00:00
Roshan Pius
45391d1b76 Merge "Fix static_assert compile issue" am: 9845354ef7 am: 6b3c4365b6
am: fa72bc1b48

Change-Id: Ia2beec198e15a7be7fd29adc047f8653ba4b47f2
2017-04-20 08:13:30 +00:00
Roshan Pius
fa72bc1b48 Merge "Fix static_assert compile issue" am: 9845354ef7
am: 6b3c4365b6

Change-Id: Ic5414a92c32b24be94ed51465c9a344c070a0cd0
2017-04-20 08:01:45 +00:00
Roshan Pius
6b3c4365b6 Merge "Fix static_assert compile issue"
am: 9845354ef7

Change-Id: Ie3b44c59244222cc63cdc72cf0f54f4b78466df8
2017-04-20 07:59:46 +00:00
Roshan Pius
9845354ef7 Merge "Fix static_assert compile issue" 2017-04-20 07:54:10 +00:00
Subhani Shaik
4cc6080b2b Fix static_assert compile issue
Change-Id: Ib8a894a7a766e10a7f8bdd4affbb672ad962690e
2017-04-20 07:54:04 +00:00