Commit graph

3732 commits

Author SHA1 Message Date
Jin Qian
2877c167ff Revert "Add useVrFlinger() method to SurfaceFlinger ConfigStore"
This reverts commit d78f6b34b6.

broke multiple builds, e.g.
https://android-build.googleplex.com/builds/submitted/3833064/test_suites_x86_64_fastbuild3d_linux/latest/logs

Change-Id: Id0dea5b63fad8896a186486d137d8505aad12c26
2017-03-21 00:09:09 +00:00
Steven Thomas
84e9b09f5d Merge "Add useVrFlinger() method to SurfaceFlinger ConfigStore" 2017-03-20 23:43:53 +00:00
Steven Moreland
04ff4a07eb Merge "Use simplified update-makefiles.sh script." 2017-03-20 22:08:05 +00:00
Roshan Pius
10ed93a049 Merge "supplicant(interface): Correct the WFD info length" am: d51c817675 am: f092ffbe9d
am: bf6ce1a507

Change-Id: Ie0e6e8abc4d09406761bbb14bf513bf2a4e22314
2017-03-20 21:41:53 +00:00
Roshan Pius
a5f869f491 Merge "supplicant(interface): Support for P2P client list and save config" am: 91c2cb3284 am: 2f52b0d8e4
am: 1100f4e570

Change-Id: Ia582415cbbac3abadfff71ec93fcc8b30a18347f
2017-03-20 21:41:21 +00:00
Roshan Pius
bf6ce1a507 Merge "supplicant(interface): Correct the WFD info length" am: d51c817675
am: f092ffbe9d

Change-Id: I9bcfb6f174f7387956bbec423175e39004235782
2017-03-20 21:38:58 +00:00
Roshan Pius
1100f4e570 Merge "supplicant(interface): Support for P2P client list and save config" am: 91c2cb3284
am: 2f52b0d8e4

Change-Id: Ibfad7dd79c36f4ce93a6febf3c46838f92bcad10
2017-03-20 21:38:22 +00:00
Roshan Pius
f092ffbe9d Merge "supplicant(interface): Correct the WFD info length"
am: d51c817675

Change-Id: I05c077fbdfb2c0b085e869101c5548318ade3eaf
2017-03-20 21:38:09 +00:00
Roshan Pius
2f52b0d8e4 Merge "supplicant(interface): Support for P2P client list and save config"
am: 91c2cb3284

Change-Id: Id18d9ad5427703f3b975691d8995ea641b9405d2
2017-03-20 21:35:20 +00:00
Treehugger Robot
d51c817675 Merge "supplicant(interface): Correct the WFD info length" 2017-03-20 21:34:58 +00:00
Roshan Pius
91c2cb3284 Merge "supplicant(interface): Support for P2P client list and save config" 2017-03-20 21:30:43 +00:00
Steven Thomas
d78f6b34b6 Add useVrFlinger() method to SurfaceFlinger ConfigStore
Add useVrFlinger() method to SurfaceFlinger ConfigStore, which is
used to ensure we only start vr flinger on Daydream ready devices.

Bug: 35885165

Test: Checked for "SurfaceFlinger UseVrFlinger" in the logs,
confirmed it only shows up for Daydream ready devices.

Change-Id: I3c39b1f094e28f06b510171fc0968cf71f5d5550
2017-03-20 14:15:26 -07:00
TreeHugger Robot
f99bfb739d Merge "Add graphics composer support for HWC > HWC1.1" 2017-03-20 21:12:59 +00:00
Nick Desaulniers
8174a847f2 fingerprint: check return status of hwbinder calls
If system_server dies, and return codes of hwbinder calls are not
checked, an abort of the HAL service will occur.  In this case,
warn in the logs, but allow system_server to reopen HAL.

Bug: 34867134
Change-Id: I9fe1c2c0f1c03e8debafb56bff8a7490ccbbcec0
2017-03-20 14:12:43 -07:00
Fabien Sanglard
0d55a21044 Add graphics composer support for HWC > HWC1.1
Test: Ryu, Marlin
Change-Id: I58a7394f427534b942d64c93b1891a756c5f510c
2017-03-20 12:24:29 -07:00
Shuzhen Wang
43698a2f5d Camera: Add doc for combined stream usage flags
Specify the HAL behavior when stream usage flag is combination for
multiple consumers.

Test: Compile
Bug: 33777818
Change-Id: I97e7bcc79ee36a395210c7cf8deefc4f175d3e07
2017-03-20 12:10:31 -07:00
Yifan Hong
ec4433ac47 Merge "IUsb uses "default" service name" 2017-03-20 17:51:15 +00:00
Steven Moreland
3d0244bd9d Merge "configstore: respect service registration status." am: e8e87df57f am: 9761a112e1
am: 5f44edfb21

Change-Id: I9db78e30ec60088e09384a8134304f0f73bd391e
2017-03-20 17:27:59 +00:00
Steven Moreland
5f44edfb21 Merge "configstore: respect service registration status." am: e8e87df57f
am: 9761a112e1

Change-Id: Ie4094649cf67652ee8af8ba5f49c700c2533abbd
2017-03-20 17:21:35 +00:00
Steven Moreland
2628f37ba0 Versioning, add additional package import. am: a233c182be am: f0dd7270f1
am: 3bb7c80e1d

Change-Id: I41d46e089aca2ef875ce28a5bfad3ab3745184ac
2017-03-20 17:20:41 +00:00
Steven Moreland
9761a112e1 Merge "configstore: respect service registration status."
am: e8e87df57f

Change-Id: I528fc4914ab9b1da49825b425bd5672e0b117add
2017-03-20 17:14:54 +00:00
Treehugger Robot
e8e87df57f Merge "configstore: respect service registration status." 2017-03-20 17:02:55 +00:00
Steven Moreland
3bb7c80e1d Versioning, add additional package import. am: a233c182be
am: f0dd7270f1

Change-Id: Id766cbb454e0b0fc895ca5ed5e44e7b2dfd1ebc7
2017-03-20 16:56:56 +00:00
Steven Moreland
f0dd7270f1 Versioning, add additional package import.
am: a233c182be

Change-Id: I5d84ccd57530fa7086f50e469ab75a05d40ad800
2017-03-20 16:53:25 +00:00
Roshan Pius
d65be16cfd supplicant(interface): Correct the WFD info length
Error logs from test:
03-17 18:34:34.303  1781  1781 E wpa_supplicant: Unexpected WFD device
info len: 6

Bug: 36401779
Test: Compiles
Change-Id: I65805599f8f3242a5c1f6ba8c0a1b9da05df79b4
2017-03-20 08:01:43 -07:00
Roshan Pius
94b4bdca75 supplicant(interface): Support for P2P client list and save config
Bug: 36042785
Test: Compiles
Change-Id: Ib47b47762c05e6252f692c1456e9b8d5dd8c051a
2017-03-20 08:01:43 -07:00
Steven Moreland
a233c182be Versioning, add additional package import.
Added versioning@2.4. This tests the same as 2.2->2.3, but also repros
an issue in hidl-gen where triple inheritance isn't allowed.

Test: minor version inheritance doesn't fail, triple inheritance works
Bug: 36162559
Change-Id: Id5518621cd068b1b623f30f6f6762a1bf8ae6a80
2017-03-20 14:15:46 +00:00
Steven Moreland
54cc198022 update-makefiles for transisitive dependencies
Test: pass
Bug: 36162559
Change-Id: I4f5fddaef9811f0da1d69fa26a5d34830a1a9634
2017-03-20 07:13:46 -07:00
Bartosz Fabianowski
2377553df2 Add manufacturer and model to device ID attestation
Discussions have shown that in addition to brand, device and product,
we should also allow devices to attest their manufacturer and model.

Bug: 36433192
Test: GTS com.google.android.gts.security.DeviceIdAttestationHostTest

Change-Id: I5a9fd839497976cdb1e44cbe4a2d5b7730732b4c
2017-03-20 14:01:03 +01:00
Michael Wright
bf3bc86bea Add amplitude control to vibrator HAL
Providing control over the strength of the vibration allows the platform
to provide a richer haptic experience to users. How this amplitude is
modulated is left up to the vibrator implementation.

This also adds an interface to ask the HAL to perform specific haptic
effects. By exposing the intent of the haptic event to the HAL, we can
let device and haptic driver manufacturers implement custom waveforms
that more closely match the desired effect.

Test: Manual testing with Marlin HAL +
      adb shell /data/nativetest/vibrator_hidl_hal_test/vibrator_hidl_hal_test
Change-Id: Icfccb464c6c85adecdf354e2bd4cf422d7d31eb5
2017-03-20 12:57:53 +00:00
Steven Moreland
3a18d73829 Use simplified update-makefiles.sh script.
Test: update-makefiles
Bug: 35870521
Change-Id: I652db1f458f07f0b254966c2acee0b441a0bcae1
2017-03-20 04:26:20 -07:00
TreeHugger Robot
9198e7bb30 Merge "Camera: add batching support" 2017-03-20 06:13:12 +00:00
Yin-Chia Yeh
bed3a9473e Camera: add batching support
Currently only batching high speed recording request/results.

Test: GCA slow motion recording working
Bug: 34899394
Change-Id: Id83b9d1cefe011391c86a5e7e898262a169cc9e7
2017-03-19 21:36:49 -07:00
Andre Eisenbach
b902fd15dd Merge "Bluetooth: Do not die quietly on binder death" am: e5796ef7a6 am: 810bb51999
am: d50f39d08e

Change-Id: I0db28e80bcc72de8023981c38cb5bdb84f02a57f
2017-03-19 23:56:01 +00:00
Andre Eisenbach
d50f39d08e Merge "Bluetooth: Do not die quietly on binder death" am: e5796ef7a6
am: 810bb51999

Change-Id: I0aa8e83a1f4ca3c51e66e0a32c23e4501a05530a
2017-03-19 23:51:44 +00:00
Andre Eisenbach
810bb51999 Merge "Bluetooth: Do not die quietly on binder death"
am: e5796ef7a6

Change-Id: Iac0bbc32f414e13a21c338400a49fde08af47455
2017-03-19 23:48:45 +00:00
Treehugger Robot
e5796ef7a6 Merge "Bluetooth: Do not die quietly on binder death" 2017-03-19 23:45:58 +00:00
Steven Moreland
f88a9fe446 configstore: respect service registration status.
Bug: 36424561
Test: pass
Change-Id: I546af49d589e455b6dd97ca45d2330aa82059a4a
2017-03-19 14:39:36 -07:00
Eric Laurent
0fc208d2ca audio: fix mistake in AudioDevice enum
commit e6653b5d failed to include devices (IN|OUT)_USB_HEADSET
in (IN|OUT)_ALL and (IN|OUT)_ALL_USB masks

Test: audio playback and capture regression tests on marlin
Change-Id: I218b0c3ff868f3e1434e93a9e2fb07b3e16a2df8
2017-03-17 17:34:44 -07:00
Sanket Padawe
f8654facce Merge "Add VTS test for misc RIL apis." am: 69c546ba21 am: d9dabe6b57
am: 592ddbf04e

Change-Id: Iebeec166e521d2203fb01c75f2a4ae5b8c041477
2017-03-17 23:34:24 +00:00
Sanket Padawe
592ddbf04e Merge "Add VTS test for misc RIL apis." am: 69c546ba21
am: d9dabe6b57

Change-Id: Ib8b6086623384f536638ee36c3703a93da1999e5
2017-03-17 23:28:52 +00:00
Sanket Padawe
d9dabe6b57 Merge "Add VTS test for misc RIL apis."
am: 69c546ba21

Change-Id: Ib4edda9c989f0b4b2c9a88e875ff723f9a775cb1
2017-03-17 23:24:38 +00:00
Treehugger Robot
69c546ba21 Merge "Add VTS test for misc RIL apis." 2017-03-17 23:15:14 +00:00
TreeHugger Robot
5da2007ac0 Merge "Create hasSyncFramework property for SF" 2017-03-17 23:14:44 +00:00
Eino-Ville Talvala
34d861b785 Merge "camera.provider@2.4: Legacy wrapper: Run with more threads." 2017-03-17 23:04:10 +00:00
Jayachandran Chinnakkannu
f07f7d9fcb Merge "Add new precise call fail causes and OEM causes" am: 3928ae4117 am: a6d3475677
am: cc792c8cb3

Change-Id: I492a1925bc350bad846782f8be2841f91e4b182e
2017-03-17 22:41:42 +00:00
Jayachandran Chinnakkannu
cc792c8cb3 Merge "Add new precise call fail causes and OEM causes" am: 3928ae4117
am: a6d3475677

Change-Id: I8f93d9415d1e6d9b6fb5d08800f8c07246058446
2017-03-17 22:34:07 +00:00
Jayachandran Chinnakkannu
a6d3475677 Merge "Add new precise call fail causes and OEM causes"
am: 3928ae4117

Change-Id: Ia74e54f7e57c55c24cc4a2cf0d299d46f3005629
2017-03-17 22:27:18 +00:00
Jayachandran Chinnakkannu
3928ae4117 Merge "Add new precise call fail causes and OEM causes" 2017-03-17 22:18:24 +00:00
Tomasz Wasilczyk
a8542b28ef Merge "Set skipSubChannel both to true and false when testing scan and step methods." 2017-03-17 21:53:10 +00:00