Marco Nelissen
97a11597b6
Merge "libaudiohw_legacy needs libaudioclient_headers"
2019-10-08 19:26:28 +00:00
Marco Nelissen
19c60b3e2a
libaudiohw_legacy needs libaudioclient_headers
...
Test: build
Change-Id: I0ad1a777a0358a0f79d495747a7ca4bddf984d45
Merged-In: I0ad1a777a0358a0f79d495747a7ca4bddf984d45
2019-10-08 09:41:33 -07:00
Xin Li
8eb6e081d4
Merge "DO NOT MERGE - Merge Android 10 into master"
2019-09-05 16:53:35 +00:00
Xin Li
bdb5c17e60
DO NOT MERGE - Merge Android 10 into master
...
Bug: 139893257
Change-Id: Ieb5298f552c800e60647be5a75f754f0df5b374d
2019-09-04 13:34:19 -07:00
Xin Li
e6bfce1fab
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
Bug: 134405016
Change-Id: If15c8a3107ce7a275859783280760116063b9274
2019-07-01 20:59:53 +00:00
Tri Vo
2843fd5f4a
Merge "libpower: RAII wake lock implementation" am: a53a8a7193
...
am: aac0a1f5d3
2019-06-26 19:43:16 -07:00
Tri Vo
aac0a1f5d3
Merge "libpower: RAII wake lock implementation"
...
am: a53a8a7193
2019-06-26 19:29:37 -07:00
Tri Vo
a53a8a7193
Merge "libpower: RAII wake lock implementation"
2019-06-27 01:59:08 +00:00
Tri Vo
934f175a42
libpower: RAII wake lock implementation
...
Main motivation is to prevent wake lock leaks, e.g. b/133175847.
Changing power.h header breaks downstream vendor code that does C
linkage to that header b/135730848. Introduce new wakelock.h header.
Bug: 133175847
Test: boot blueline
Test: device suspends if left alone
Change-Id: I477123938ab20e954ce4d55b8588c0a116ed3882
2019-06-26 13:01:39 -07:00
Ruslan Tkhakokhov
f830e916a0
Merge "Merged-In Revert "libpower: RAII wake lock implementation"" am: 6e5d1db64b
...
am: 44e3795879
2019-06-21 08:27:52 -07:00
Ruslan Tkhakokhov
44e3795879
Merge "Merged-In Revert "libpower: RAII wake lock implementation""
...
am: 6e5d1db64b
2019-06-21 08:08:17 -07:00
Ruslan Tkhakokhov
6e5d1db64b
Merge "Merged-In Revert "libpower: RAII wake lock implementation""
2019-06-21 10:34:43 +00:00
Ruslan Tkhakokhov
acf23a23e7
Merged-In Revert "libpower: RAII wake lock implementation"
...
This reverts commit 23009bb199
2019-06-21 10:32:57 +00:00
Tri Vo
9fcd627425
Merge "libpower: RAII wake lock implementation" am: cc685232f7
...
am: 8fbabc2d9a
2019-06-20 15:57:49 -07:00
Tri Vo
8fbabc2d9a
Merge "libpower: RAII wake lock implementation"
...
am: cc685232f7
2019-06-20 15:25:39 -07:00
Tri Vo
cc685232f7
Merge "libpower: RAII wake lock implementation"
2019-06-20 19:42:50 +00:00
Tri Vo
23009bb199
libpower: RAII wake lock implementation
...
Bug: 133175847
Test: boot blueline
Test: device suspends if left alone
Change-Id: I5a63fedabb18a9dcd510ca76303f54ec6c0b7f8c
2019-06-20 09:02:16 -07:00
Tri Vo
0c4ea927cb
Merge "libpower_test: require root on test device" am: 2f8294eec6
...
am: d48d28f042
2019-06-15 17:08:02 -07:00
Tri Vo
d48d28f042
Merge "libpower_test: require root on test device"
...
am: 2f8294eec6
2019-06-15 16:54:59 -07:00
Tri Vo
2f8294eec6
Merge "libpower_test: require root on test device"
2019-06-15 23:46:47 +00:00
Tri Vo
54ecb7ea67
libpower_test: require root on test device
...
And promote the test back to presubmit
Fixes: 134078730
Test: libpower_test
Change-Id: I2773bf57698460d98fbeba79659724b0ef75eaf3
2019-06-15 13:58:06 -07:00
Tri Vo
6cb451db4d
Merge "libpower: add error logs" am: 9462a528d1
...
am: 9f7dc4acfc
2019-06-04 19:31:22 -07:00
Tri Vo
ca74aef185
Merge "Demote libpower_test to postsubmit" am: 18e20caa81
...
am: 33c2c1f872
2019-06-04 19:25:02 -07:00
Tri Vo
9f7dc4acfc
Merge "libpower: add error logs"
...
am: 9462a528d1
2019-06-04 18:58:08 -07:00
Tri Vo
33c2c1f872
Merge "Demote libpower_test to postsubmit"
...
am: 18e20caa81
2019-06-04 17:57:31 -07:00
Tri Vo
9462a528d1
Merge "libpower: add error logs"
2019-06-05 00:26:00 +00:00
Tri Vo
18e20caa81
Merge "Demote libpower_test to postsubmit"
2019-06-04 18:16:36 +00:00
Tri Vo
329dbd296d
Demote libpower_test to postsubmit
...
The state of the test device w.r.t. root permissions is not guaranteed,
which leads to this test (and others) to be flaky.
Bug: 134078730
Test: n/a
Change-Id: Ieb87e3275289b11f843c18343e5d50a41c7b1993
2019-06-04 11:12:05 -07:00
Tri Vo
3714b98cf5
libpower: add error logs
...
Bug: 134078730
Test: libpower_test
Change-Id: I35ac20c3f075bb83e61d5fad5bcfd8a1876b0c30
2019-05-31 11:48:17 -07:00
Ahmed ElArabawy
86d26ee18d
Merge "Wifi: Update the wifi_sar_scenario enum"
2019-04-03 14:54:00 +00:00
Ahmed ElArabawy
ed29afb0b6
Wifi: Add ether type to sending offloaded packet
...
In current implementation, the ether type used for offloaded
packets is always hardcoded to IPv4 in lower layers.
This commit adds support to specify ether type of offloaded
packets from user space.
Bug: 122487582
Test: Manual
Change-Id: I1ca7391bd70ecebaf0591e0eafe08b79383538c5
2019-04-02 15:30:59 -07:00
Ahmed ElArabawy
151427c297
Wifi: Update the wifi_sar_scenario enum
...
This commit updates the enum for wifi_sar_scenario.
Bug: 112205428
Test: Compiles (just a header file change)
Change-Id: If01d0daf5e535e8fdca6eeab115f6c409cc38c46
2019-03-29 01:54:49 +00:00
Ahmed ElArabawy
fc49b8693e
Wifi: Add ether_type to sending offloaded packet
...
This commit is part of the addition of the ether_type as an argument
to the legacy hal function to send an offloaded packet.
Bug: 122487582
Test: Manual
Test: Make sure code builds properly
Change-Id: I5c56acb74f5724ac3d6199433c7632177bfc9704
2019-03-18 15:58:41 -07:00
Jooyung Han
18bd84a68a
Merge "Revert "Mark libhardware_legacy as double_loadable"" am: 0f90ed1ffc am: 1a0ad92fd9
...
am: 3617f1eb59
2019-03-12 15:33:44 -07:00
Jooyung Han
3617f1eb59
Merge "Revert "Mark libhardware_legacy as double_loadable"" am: 0f90ed1ffc
...
am: 1a0ad92fd9
2019-03-12 15:28:42 -07:00
Jooyung Han
1a0ad92fd9
Merge "Revert "Mark libhardware_legacy as double_loadable""
...
am: 0f90ed1ffc
2019-03-12 15:24:41 -07:00
Treehugger Robot
0f90ed1ffc
Merge "Revert "Mark libhardware_legacy as double_loadable""
2019-03-12 22:11:27 +00:00
Jooyung Han
53a4f1a31f
Revert "Mark libhardware_legacy as double_loadable"
...
This reverts commit 3ec8dc636a
2019-03-11 14:11:02 +00:00
Tri Vo
f6335797c7
Merge "libpower: remove VTS configs" am: 2bd0b3da7e am: ee40e5225e
...
am: dd7156f26e
2019-03-01 10:13:36 -08:00
Tri Vo
dd7156f26e
Merge "libpower: remove VTS configs" am: 2bd0b3da7e
...
am: ee40e5225e
2019-03-01 09:59:08 -08:00
Tri Vo
ee40e5225e
Merge "libpower: remove VTS configs"
...
am: 2bd0b3da7e
2019-03-01 09:42:59 -08:00
Treehugger Robot
2bd0b3da7e
Merge "libpower: remove VTS configs"
2019-03-01 17:30:34 +00:00
Tri Vo
0f6b6bdf59
libpower: remove VTS configs
...
Rationale:
- libpower_test is not part of VTS compliance.
- we already rely on TEST_MAPPING for continuous integration.
Bug: n/a
Test: n/a
Change-Id: I20830712276a04be98b4c60d6d24036998501de6
2019-02-28 14:31:57 -08:00
Xin Li
832e184f43
Merge stage-aosp-master into pi-dev-plus-aosp
...
am: a78a06d7d3
2019-02-25 05:36:55 -08:00
Xin Li
a78a06d7d3
Merge stage-aosp-master into pi-dev-plus-aosp
...
Bug: 126125118
Change-Id: I47c7f0d8fad0aac954e88402ce0068d978337086
2019-02-25 00:30:27 -08:00
Xin Li
6b3259d4f3
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
Bug: 120848293
Change-Id: I4d500884139b866223b9fb4cd5da0b49f2f6ac72
2019-02-20 16:19:27 -08:00
Jooyung Han
eb3a40b2de
Merge "Mark libhardware_legacy as double_loadable" am: 8258648600 am: e394c4d180
...
am: 58ffd829c7
2019-02-13 20:57:17 -08:00
Jooyung Han
58ffd829c7
Merge "Mark libhardware_legacy as double_loadable" am: 8258648600
...
am: e394c4d180
2019-02-13 20:51:40 -08:00
Jooyung Han
e394c4d180
Merge "Mark libhardware_legacy as double_loadable"
...
am: 8258648600
2019-02-13 20:22:59 -08:00
Treehugger Robot
8258648600
Merge "Mark libhardware_legacy as double_loadable"
2019-02-14 02:10:05 +00:00
