Dan Willemsen
917bcc4df9
resolve merge conflicts of 69ed5d9 to stage-aosp-master am: d269bf4328 am: c1965c958c
...
am: 0002fe0e75
2016-07-13 19:30:24 +00:00
Dan Willemsen
0002fe0e75
resolve merge conflicts of 69ed5d9 to stage-aosp-master am: d269bf4328
...
am: c1965c958c
2016-07-13 19:26:54 +00:00
Dan Willemsen
d269bf4328
resolve merge conflicts of 69ed5d9 to stage-aosp-master
...
Change-Id: I1e86670dcf4e3187efca4beff673bbc057cbd509
2016-07-13 11:28:47 -07:00
Andy Hung
0caeee8ac4
Improve stub hal read and write timing
...
Now considers time to mix or record.
Bug: 29634175
Change-Id: Ifb2a2e11cb75ca9e83aadbc95943a618b0707f3f
2016-07-13 11:19:40 -07:00
Dan Willemsen
f51bf92061
Begin converting Android.mk to Android.bp
...
These modules have their dependencies satisfied.
Change-Id: I67986efd7478e477770bedac72ab35a407e3d06a
2016-07-12 23:34:37 -07:00
Greg Kaiser
2c8df717c8
Merge "nfc-nci: Silence compiler warnings"
2016-07-11 20:44:37 +00:00
Greg Kaiser
ca3fed183e
Merge "InputHub: Fix compiler warnings"
2016-07-11 19:45:59 +00:00
Sam Hurst
e58feec48f
Default VHAL always returns 0 for driving status
...
Bug: 29968492
Change-Id: I84416ae6fe919b102204f17166a38270a6f707e2
(cherry picked from commit 5be024b7df719f4bcca619bdbcf6643748b96f69)
2016-07-11 19:21:26 +00:00
Greg Kaiser
0a3bb226c2
nfc-nci: Silence compiler warnings
...
Change-Id: I3efe0e3d181f282a9cf6e0852d9d143ff0ed78a3
2016-07-11 12:08:47 -07:00
Greg Kaiser
8f35d920ba
hwcomposer: Fix compiler warnings
...
For our prepare and set methods, starting in HWC 1.0 we're
assured that numDisplays is at least 1 and displays[0] is
non-NULL, so we're okay with not explicitly checking that.
We also fix a minor typo while we're in here.
Change-Id: Ia5452a9b3b48e1d6697562a2a9e0ea4d415df5c4
2016-07-08 18:16:16 -07:00
Greg Kaiser
3e416aecdf
Merge "audio_hw: Fix compiler warnings"
2016-07-01 17:41:42 +00:00
Greg Kaiser
8ccf3981e6
Merge "SensorEventQueue_test: Fix compiler warnings"
2016-07-01 13:04:39 +00:00
Greg Kaiser
51b400214c
Merge "vehicle: Fix compiler warnings"
2016-07-01 13:04:25 +00:00
Greg Kaiser
d4b027cf84
Merge "tv_input: Fix compiler warnings"
2016-07-01 13:04:10 +00:00
Greg Kaiser
cb1f9397ba
vehicle: Fix compiler warnings
...
Change-Id: I504661230e22bcdc5e52e55d95e0ceb795e45052
2016-06-30 17:10:07 -07:00
Greg Kaiser
1f5ff498e3
tv_input: Fix compiler warnings
...
Change-Id: I427d81effa70e165e36dc8794df872fc7783bacd
2016-06-30 16:50:13 -07:00
Chih-Hung Hsieh
9dafc85c8f
Merge \\\"Fix google-explicit-constructor warnings in libhardware\\\" am: 99d2543a12 am: 5aeef066b1
...
am: f6447b0eb5
2016-06-30 23:22:12 +00:00
Chih-Hung Hsieh
5aeef066b1
Merge \"Fix google-explicit-constructor warnings in libhardware\"
...
am: 99d2543a12
2016-06-30 23:14:35 +00:00
Greg Kaiser
6c59aadad9
audio_hw: Fix compiler warnings
...
Change-Id: Iab7e91df4d8fb0d8e74aa8e2ca0836cf7e43bf03
2016-06-30 16:08:53 -07:00
Greg Kaiser
682d4f45e3
InputHub: Fix compiler warnings
...
Change-Id: I3508b2d0c97baf167894917f2980d761e6169441
2016-06-30 16:03:16 -07:00
Greg Kaiser
dff39d23ec
SensorEventQueue_test: Fix compiler warnings
...
Change-Id: I841172e4257f4425dcacbe4984b539b70b8ab1e5
2016-06-30 15:57:04 -07:00
Chih-Hung Hsieh
928e679cf3
Fix google-explicit-constructor warnings in libhardware
...
Bug: 28341362
Change-Id: I29a56734e54740e4b15fe2f6cacbbd867163ae79
Test: build with clang-tidy
2016-06-30 14:21:20 -07:00
Paul McLean
bc15ffbe45
Simplify and clarify channel count/mask calculation for stream open routines.
...
am: 64345f8f2e
2016-06-14 14:19:43 +00:00
Paul McLean
64345f8f2e
Simplify and clarify channel count/mask calculation for stream open routines.
...
Bug: 29154372
Change-Id: I849c02da0cc500e906cbda97b7258a3acf1e38f2
2016-06-13 13:59:59 -06:00
Paul McLean
007e3c6d93
replace naked pthread_mutex_ functions with semantics-explicit lock/unlock functions.
...
am: 994ac07b96
2016-06-03 13:57:27 +00:00
Paul McLean
994ac07b96
replace naked pthread_mutex_ functions with semantics-explicit lock/unlock functions.
...
Bug: 29103653
Change-Id: Ic91f75f8653f7946790b8b433236fd918b41f3a6
2016-06-02 15:33:24 -06:00
Paul McLean
1c2e74485d
Merge "Fix up inconsistent variable names." into nyc-mr1-dev
...
am: dd01395ef1
2016-06-02 13:45:18 +00:00
Paul McLean
76dba68c96
Fix up inconsistent variable names.
...
Bug: 29065081
Change-Id: I1c8305afdebd7e1eedb4afafb0d06003c6a9e576
2016-06-01 13:14:02 -06:00
Paul McLean
916d452d86
Merge "Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL" into nyc-mr1-dev
...
am: f0541b5214
2016-06-01 16:12:55 +00:00
Paul McLean
6a75e4e06a
Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL
...
Bug: 28960293
Change-Id: Ia3a2b966079633d9357e5ae96247b771073f2de6
2016-06-01 07:24:21 -06:00
Paul McLean
9f92034fa5
Merge "Ensure we get a default sample rate for "query" cases in open_input_device()." into nyc-dev
...
am: 86df5ad096
2016-05-25 21:11:38 +00:00
Paul McLean
9a1c30572b
Ensure we get a default sample rate for "query" cases in open_input_device().
...
Bug: 28474561
Change-Id: I2946dda95ab47bd38a582f49e566541bc4e20bbf
2016-05-25 14:45:47 -06:00
Paul McLean
ddf5d74c44
Merge "Lock input and output sample rates" into nyc-dev
...
am: 6bd8429fe2
2016-05-25 18:42:05 +00:00
Paul McLean
1d585cc7ab
Lock input and output sample rates
...
Bug: 28474561
Change-Id: I551d346aea9c4f36b51a9c1a1c557c5e2757334b
2016-05-25 10:37:03 -06:00
Chih-hung Hsieh
78df3759f6
Merge "Fix misc-macro-parentheses warnings." am: 2d0b1fa2e9
...
am: 10e811f13e
2016-05-16 18:57:42 +00:00
Chih-Hung Hsieh
4d52b43cb6
Fix misc-macro-parentheses warnings.
...
Bug: 28705665
Change-Id: Ie514abfe12bea065658da3706aad8b4c9c0a93c7
2016-05-12 10:07:30 -07:00
Dongwon Kang
4832e78bf1
Revert "tv_input: add signal detection flag to stream config"
...
am: da941d8f1c
2016-05-04 17:44:38 +00:00
Dongwon Kang
da941d8f1c
Revert "tv_input: add signal detection flag to stream config"
...
This reverts commit d15399e13d
2016-05-03 23:44:53 +00:00
Nick Vaccaro
7f8d8bfe3c
Sensors: MultiHal: fix naming and compiler warning
...
am: a889c09
2016-04-19 20:46:33 +00:00
Nick Vaccaro
a889c0915a
Sensors: MultiHal: fix naming and compiler warning
...
Changed module name back to sensors.$(TARGET_DEVICE) to assure
proper load ordering.
Fix use of GNU old-style field designator extension and a couple
type-mismatched comparisons.
Bug: 28251347
Change-Id: I7cf6cc1f78085b8b254729cd8ec42bdb20ea3f81
2016-04-18 16:37:34 -07:00
Arunesh Mishra
e00ce63dad
Merge "Add "clear" command." into nyc-dev
...
am: 041e2a2
2016-04-09 01:55:45 +00:00
Arunesh Mishra
57ec0192a5
Add "clear" command.
...
Minor visual fixes for the command line interface.
Bug: 27279191
Change-Id: Ibb20231125c5d46bffc9241711c46dd8101dffb3
2016-04-08 09:55:16 -07:00
Keun-young Park
fe04ac8365
vehicle hal further clarification / HVAC update
...
am: 418c7e8
2016-04-07 02:51:19 +00:00
Keun-young Park
418c7e8fc9
vehicle hal further clarification / HVAC update
...
- added HVAC_POWER_ON property
- added special INT / FLOAT OUT_OF_RANGE values for
max / min / off state
- added dump call for debugging: necessary for debugging
- clarified subscribe behavior for ON_CHANGE type
VNS will make additional get call for checking initial
state.
- added clarification on possible -EAGAIN for set call
- added mute flag to allow muting radio from android
bug: 27721415
bug: 28022648
bug: 27971383
bug: 27971578
Change-Id: Ie9a7334b86ab53174b91a4dc651fd87ca17af3d9
2016-04-06 15:37:07 -07:00
Jean-Michel Trivi
18504a1899
Fix typo in error logs in r_submix open_input_stream function
...
am: 79fbccf
2016-04-06 16:23:36 +00:00
Jean-Michel Trivi
79fbccf91b
Fix typo in error logs in r_submix open_input_stream function
...
Change-Id: I52d5268290802e3f0a88662aa6fbe9a46efda735
2016-04-05 17:20:29 -07:00
Ryan Bavetta
a6cbeb2e63
Merge "Fix build error in stub soundtrigger HAL" into nyc-dev
...
am: 0718681
2016-04-01 22:12:19 +00:00
Ryan Bavetta
0718681e3e
Merge "Fix build error in stub soundtrigger HAL" into nyc-dev
2016-04-01 22:07:14 +00:00
Ruben Brunk
3c321e8528
Merge "Update temp limits in thermal HAL impl." into nyc-dev
...
am: 00a5d61
2016-03-31 18:13:02 +00:00
Ruben Brunk
00a5d61408
Merge "Update temp limits in thermal HAL impl." into nyc-dev
2016-03-31 18:03:35 +00:00
Chris Thornton
e8143ef5c7
Bump the sound trigger device api\'s minor version number.
...
am: 0a96510
2016-03-30 20:41:54 +00:00
Chris Thornton
0a965102e7
Bump the sound trigger device api's minor version number.
...
This is needed so we know if we should look for the
stop_all_recognitions function.
Change-Id: Ifa1d7ac0fa293e04bf80729bf34fefa48e74b8bb
2016-03-30 11:25:11 -07:00
Ryan Bavetta
12b20e31d1
Fix build error in stub soundtrigger HAL
...
Also combines sound model events and trigger events
BUG:27852833
Change-Id: I277b35a5b32c18b09a2c68024f30f9b981688900
2016-03-29 13:09:51 -07:00
Chris Thornton
5a0aea391f
Merge "Adds stop_all_recognitions as an optional method to the sound trigger hal." into nyc-dev
...
am: caa94e5
2016-03-29 17:48:15 +00:00
Chris Thornton
42a448d790
Adds stop_all_recognitions as an optional method to the sound trigger hal.
...
Change-Id: I6c905b79673fe21782f5dc5f3abc4c2ac75de805
2016-03-29 09:19:44 -07:00
Ruben Brunk
53b134045f
Update temp limits in thermal HAL impl.
...
Bug: 27549685
Change-Id: I280610bbfda7d9fb65a7bc42831c4a545ea21757
2016-03-25 13:45:00 -07:00
Rob Herring
c3855dc8e2
Merge "vibrator: add support to use led-trigger interface"
...
am: 8944479
2016-03-24 21:09:21 +00:00
Rob Herring
61701df363
vibrator: add support to use led-trigger interface
...
The existing vibrator HAL uses the timed_output interface which will
never be moved out of kernel's staging tree. The kernel already has a
similar feature with GPIO controlled LEDs and LED triggers. While a
vibrator is not an LED, the control model is the same and can be reused.
Additionally, DT bindings already exist for GPIO controlled LEDs.
This adds support for the LED device in addition to the timed_output
device. It uses the "transient" trigger for the LED device named
"vibrator".
Change-Id: I90d52d6e50d83d255f484db148064069504f78e0
Signed-off-by: Rob Herring <robh@kernel.org>
2016-03-22 13:59:42 -05:00
Polina Bondarenko
020fa12eef
Merge "Re-worked hardware_properties to thermal HAL." into nyc-dev
2016-03-19 08:43:33 +00:00
Andy Hung
b149109eef
Merge "Update audio services for 64 bit compilation" into nyc-dev
2016-03-18 20:23:26 +00:00
Andy Hung
19540e344b
Update audio services for 64 bit compilation
...
Bug: 27479136
Change-Id: I1cb6baf3c507c7004b3245176727be1fd96174df
2016-03-18 10:43:05 -07:00
Polina Bondarenko
25cd7f0fb0
Re-worked hardware_properties to thermal HAL.
...
Bug: 27424857
Change-Id: Id7212421e499cc33c82e885756d68e89c2317acf
2016-03-17 10:09:24 +01:00
Keun-young Park
51839a6cd1
Merge "vehicle hal update" into nyc-dev
2016-03-15 22:08:29 +00:00
Keun-young Park
ab68e37c35
vehicle hal update
...
- add release_memory_from_get to allow hal to release
memory it has allocated in get call
- clear get call's behavior: If data is not available, should
return immediately with VEHICLE_ERROR_NOT_READY error
- make zone separate in vehicle_prop_config_t and
vehicle_prop_value_t: Handing of zoned property becomes
simpler
- cleanup some data type definitions for zoned properties
bug: 27597338, 27596281
Change-Id: I7a8454b86555270fb2211e5d36b3ee06d350f8ed
2016-03-14 17:00:36 -07:00
Ryan Bavetta
a8328a37e5
Allows triggering stub HAL by sound model by UUID
...
BUG: 27604763
Change-Id: I906f6f3c96ae148a7636b5481cb89f83ddb81a03
2016-03-11 22:20:30 -08:00
Keun-young Park
77761e24f9
GEAR_* rename
...
- change to GEAR_PARK and GEAR_LOW
- also remove some build warnings
bug: 27549456
Change-Id: I9062c4570afe5cacd6a17f1cb196273a719b0a97
2016-03-08 15:02:44 -08:00
Ryan Bavetta
17908ca83d
Merge "Stub HAL now can test abort and fail events" into nyc-dev
2016-03-01 03:59:33 +00:00
Ryan Bavetta
9beb06c383
Stub HAL now can test abort and fail events
...
BUG:27278692
Change-Id: Ibd03e8a13a6bd3f25b312c94436ff9f8ea2d305a
2016-02-29 18:37:29 -08:00
Eric Laurent
854a10af10
Add debug folder for audioserver
...
Use /data/misc/audioserver instead of data/misc/media for
audioserver debug.
Bug: 27064332
Change-Id: Ic213ee0354d9ab1ed1980e8c3d07cd239597ad2e
2016-02-24 00:27:46 +00:00
Arunesh Mishra
d0535ae18c
Run network thread on open.
...
This allows us to query the HAL state even when a model is not started or
after stop.
Note: Thread does not terminate on stdev->close().
Bug: 27279191
Change-Id: I6540d501c17a77bdb5cfa5528837af7bfd3ace71
2016-02-21 16:24:15 -08:00
Arunesh Mishra
e1df8138dc
Stub sound trigger hal fix for lock release.
...
Bug: 27279191
Change-Id: If339732cac782d85dc74dba9f1fb92c5a8d0c40d
2016-02-20 17:34:12 -08:00
Ryan Bavetta
f9f0871158
Fix 'end' command, initialize next in linked list
...
Thread was not ending properly because only the first
char of the end message was being sent.
The next pointer in the linked list was not being
initialized, causing it to link to bad data values.
BUG:27276657
BUG:22860713
Change-Id: Idfdf300d9ab45f9bf61eba191bb1bb0767e1cb5d
2016-02-19 21:38:44 -08:00
Arunesh Mishra
7db0a7a447
Minor sound trigger stub hal fixes.
...
Bug: 27227051
Change-Id: I90209689cfb501efc8345e140c985c25103961d7
2016-02-19 16:20:10 -08:00
Arunesh Mishra
f1d59fc9d0
Stub sound trigger HAL changes:
...
- Added a simple command parsing ability for text commands.
- Ability to output text via the socket interface.
Bug: 27227051
Change-Id: I9ea06897d69cf55b58aba5cc30f1c32773b3da00
2016-02-17 16:06:11 -08:00
Nick Vaccaro
940bd08b73
Sensors: MultiHal: Increase xfer buffer size am: 98d5e946ba
...
am: b675803d03
2016-02-16 20:31:24 +00:00
Ryan Bavetta
c2bdc551f0
Adds sound model update event, adds helper methods
...
Change-Id: Ifb03843a51a796e1fdb224d4671a52f84b4fceed
2016-02-15 15:51:46 -08:00
Ryan Bavetta
cc6541c740
Adds GenericSoundModel Event Support to Stub HAL
...
Change-Id: I2a021cbd12a4e17954dcf84528c80731054f2fd3
2016-02-10 18:40:45 +00:00
Nick Vaccaro
98d5e946ba
Sensors: MultiHal: Increase xfer buffer size
...
Increased the size of the sensor event transfer queue from 20 to
36 sensor events. This size now matches Sensor Services buffer size
that it passes to poll() for reading events and will allow the
multihal to transfer the maximum events possible per poll cycle.
Change-Id: I55459ea0a70b9da848d3d3d43590050d71c53e28
2016-02-09 15:48:19 -08:00
Dan Willemsen
25e80432de
Merge "Remove header from LOCAL_SRC_FILES" am: 5cfc02e4b1
...
am: dbb963eff1
2016-02-02 09:13:28 +00:00
Dan Willemsen
d0c1f170d6
Remove header from LOCAL_SRC_FILES
...
The build system does not use headers in LOCAL_SRC_FILES. To prevent
typos, it's now a warning to add something to LOCAL_SRC_FILES that
is not used.
Change-Id: Ieb6c6d383c04005077043d04f1b4985964ef0341
2016-02-01 19:33:33 -08:00
Ryan Bavetta
be0c8fdc94
Fixs for soundtrigger stub HAL
...
Also renames re_context to model_context, and
adds missing methods for expanded sound_trigger
operation including
sound_trigger_open_for_streaming
sound_trigger_read_samples
sound_trigger_close_for_streaming
Change-Id: I30e8eebf9c349ffae3c636277ffd0ab6805a324e
2016-02-01 15:26:09 -08:00
Glenn Kasten
b69705bee7
Merge "Remove TimedAudioTrack and associated code"
2016-01-29 00:28:59 +00:00
Ruben Brunk
e3a89161a2
Merge "Add HAL for VR mode."
2016-01-28 22:36:26 +00:00
Ryan Bavetta
7f6eb81259
Merge "Allow Multiple Triggers and Simulate DSP Events"
2016-01-28 03:25:03 +00:00
Ryan Bavetta
4615aad645
Allow Multiple Triggers and Simulate DSP Events
...
Triggers can be sent via socket connection from an app
or from the command line.
BUG: 22860713
Change-Id: I7ba8fa50286be2d08f2699e601e7c76138cc4831
2016-01-28 03:02:08 +00:00
Ruben Brunk
2c84f81cf0
Add HAL for VR mode.
...
- Provide HAL for vendors to turn on VR-specific device performance
settings when we enter VR mode in VrManagerService.
Bug: 22855417
Change-Id: I3dee920818eb0988452bf5c25d1a31f11fde7339
2016-01-27 17:58:31 -08:00
Polina Bondarenko
0cd87cf451
Added log declaration to hardware_properties.h
...
Bug: 22407109
Change-Id: I99dc10b9cea03cc0d70a742c197497e9bcd17d21
2016-01-26 18:45:46 +01:00
Polina Bondarenko
81b83b3b16
Added errno declaration to hardware_properties.h
...
Bug: 22407109
Change-Id: I1675916c811fdbec88846042f018df57a4af8963
2016-01-26 14:26:37 +01:00
Glenn Kasten
04c88495bb
Remove TimedAudioTrack and associated code
...
Bug: 8278435
Change-Id: I095c1a4888e645e14d93b0b15fbef4524a831ca1
2016-01-25 13:43:58 -08:00
Polina Bondarenko
1c408b07ed
Hardware Properties HAL: header file and default implementation
...
Added methods on Hardware Properties HAL:
getCpuTemperatures, getGpuTemperatures, getBatteryTemperautres,
getCpuUsages, getFanSpeeds and default/legacy empty implementations
(return empty lists by default).
Bug: 22407109
Change-Id: I3e0e74527cf759cc717ab03ea8e7184da5bea1e6
2016-01-22 17:29:38 +01:00
Glenn Kasten
44972ce637
Merge "Use FCC_2 and FCC_8 to highlight channel count assumptions"
2016-01-07 15:54:45 +00:00
Keun-young Park
bf877a7e66
vehicle hal update
...
- add zones to subscribe to allow selected subscription for
zoned properties
- extend config to uint32[4] to allow passing more informaiton
from configs
- change audio volume to be per context, not physical stream.
This maps better to android side's logical streams.
- renamed APP_CONTEXT to AUDIO_CONTEXT: It is useful only for
audio.
- add more audio contexts: safety alert, CD, aux audio
bug: 25183740, 26233321
Change-Id: I29de7b6c9d9a770cf87e7f50991c875d7ce9fdbe
2016-01-06 15:15:02 -08:00
Glenn Kasten
6d2cb933e0
Use FCC_2 and FCC_8 to highlight channel count assumptions
...
Bug: 21656069
Change-Id: Id2ef8e4ec716bf037a47da5ff7aec5d7ce35a1bf
2016-01-05 10:44:16 -08:00
Wonsik Kim
3d78be58b8
Merge "tv_input: add signal detection flag to stream config"
2015-12-17 07:05:52 +00:00
Keun-young Park
08c255e3b6
add clarification on parameter passing in get call
...
- with errata fix
- also removed build warnings from vehicle.c
bug: 25183740
Change-Id: I6e0ed9e300e4bc5ff8821cca87ff8509ffc0968a
2015-12-09 15:55:39 -08:00
Wonsik Kim
d15399e13d
tv_input: add signal detection flag to stream config
...
Bug: 23820259
Change-Id: I693f159b35192e14182cb3bc9082b2445c129560
2015-11-30 16:36:48 +09:00
Michael Wright
fdd4d81ca1
Only log when actually receiving actual switch events.
...
Also, turn off debug logging in a couple other classes and fix an
incorrect format specifier.
Bug: 25497538
Change-Id: I72af9492415fa6910af90caf03a7884c6cb1a0b1
2015-11-25 16:51:44 +00:00
Eino-Ville Talvala
3daeb23832
Merge "Camera: Fix Metadata static info intialization" am: f7b855ac28
...
am: 297e586c29
2015-11-19 03:02:32 +00:00
Eino-Ville Talvala
297e586c29
Merge "Camera: Fix Metadata static info intialization"
...
am: f7b855ac28
2015-11-17 23:39:13 +00:00
Jacopo Mondi
2ecebbf8ff
Camera: Fix Metadata static info intialization
...
The Metadata module segfaults when asked to initialize camera_info, upon
camera description request coming from framework.
This was caused by missing intialization of mData instance field.
Additionally, when intializing it with a template metadata, the
validation function return value was wrongly tested
Patchset 2: Do not init mData but let function flow take care of
replacing it after adding new data to it fails.
Change-Id: Iae228f0d66171ed3eac430186ced4d9b023f8de8
Signed-off-by: Jacopo Mondi <jacopo.mondi@linaro.org>
2015-11-17 09:46:40 +01:00
