Ruslan Tkhakokhov
b058a3da29
Merge "Merged-In Revert "libpower: RAII wake lock implementation"" am: 6e5d1db64b
am: 44e3795879
...
am: f830e916a0
Change-Id: Ic843215073dc6e15be899bcce1ea86ec26081971
2019-06-21 09:10:46 -07:00
Ruslan Tkhakokhov
f830e916a0
Merge "Merged-In Revert "libpower: RAII wake lock implementation"" am: 6e5d1db64b
...
am: 44e3795879
Change-Id: I58743ca5f63430eda716b15e72debb6cba4fb858
2019-06-21 08:27:52 -07:00
Ruslan Tkhakokhov
44e3795879
Merge "Merged-In Revert "libpower: RAII wake lock implementation""
...
am: 6e5d1db64b
Change-Id: I172a7823d23428da849d5fd15bb36dd96d3435d9
2019-06-21 08:08:17 -07:00
Ruslan Tkhakokhov
698a39a28a
Merged-In Revert "libpower: RAII wake lock implementation"
...
This reverts commit 23009bb199
.
Reason for revert: Breaks the build
Change-Id: I347928c4d444f4b1ce9d79f855c171626c0214c0
2019-06-21 11:43:46 +01: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
.
Reason for revert: Breaks the build
Change-Id: I347928c4d444f4b1ce9d79f855c171626c0214c0
2019-06-21 10:32:57 +00:00
Tri Vo
ece86297b7
Merge "libpower: RAII wake lock implementation" am: cc685232f7
am: 8fbabc2d9a
am: 9fcd627425
...
am: 9683806f95
Change-Id: I0abdc531dea958a96dcaf477cbd68720d8aa06ce
2019-06-20 17:46:57 -07:00
Tri Vo
9683806f95
Merge "libpower: RAII wake lock implementation" am: cc685232f7
am: 8fbabc2d9a
...
am: 9fcd627425
Change-Id: Id994c4574f8c359c1964753aa3d8aaeb7165a5b3
2019-06-20 16:35:48 -07:00
Tri Vo
9fcd627425
Merge "libpower: RAII wake lock implementation" am: cc685232f7
...
am: 8fbabc2d9a
Change-Id: I17e83309955abb6c3ebdb9b6f270a1a4d94ded10
2019-06-20 15:57:49 -07:00
Tri Vo
8fbabc2d9a
Merge "libpower: RAII wake lock implementation"
...
am: cc685232f7
Change-Id: Ia6a2bbfe192b7fccfe1ac0f8b10c3a420460c24c
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
e87a46c1f6
Merge "libpower_test: require root on test device" am: 2f8294eec6
am: d48d28f042
am: 0c4ea927cb
...
am: b25c7541a1
Change-Id: I4785728c05ed7ce8ce761b6da52cef6108342f57
2019-06-15 17:23:03 -07:00
Tri Vo
b25c7541a1
Merge "libpower_test: require root on test device" am: 2f8294eec6
am: d48d28f042
...
am: 0c4ea927cb
Change-Id: I21700e0541c704620018addd2cd7725652e9a7a9
2019-06-15 17:16:03 -07:00
Tri Vo
0c4ea927cb
Merge "libpower_test: require root on test device" am: 2f8294eec6
...
am: d48d28f042
Change-Id: I7fdfd2de9afa7baa395b710cdd1fe0a0d9e1ac8e
2019-06-15 17:08:02 -07:00
Tri Vo
d48d28f042
Merge "libpower_test: require root on test device"
...
am: 2f8294eec6
Change-Id: I5f7fda168d0cf0e8c5267885270ffd2cb1552aac
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
fdb5a1b54b
Merge "libpower: add error logs" am: 9462a528d1
am: 9f7dc4acfc
am: 6cb451db4d
...
am: 1de3066350
Change-Id: Id20d4685e8c0134354a284d72973e8b06896665e
2019-06-04 21:33:46 -07:00
Tri Vo
28bd895926
Merge "Demote libpower_test to postsubmit" am: 18e20caa81
am: 33c2c1f872
am: ca74aef185
...
am: cd6c0efa90
Change-Id: I965aa96100321abf43d5afdaab79aedd37c27e09
2019-06-04 21:17:15 -07:00
Tri Vo
1de3066350
Merge "libpower: add error logs" am: 9462a528d1
am: 9f7dc4acfc
...
am: 6cb451db4d
Change-Id: I4b031ab3969e1bc1c81f180baec9dcd291aea687
2019-06-04 20:12:54 -07:00
Tri Vo
cd6c0efa90
Merge "Demote libpower_test to postsubmit" am: 18e20caa81
am: 33c2c1f872
...
am: ca74aef185
Change-Id: I9988580c43bc024f761b3a24626e7eec8d1fa722
2019-06-04 19:58:24 -07:00
Tri Vo
6cb451db4d
Merge "libpower: add error logs" am: 9462a528d1
...
am: 9f7dc4acfc
Change-Id: Ib79ad75bb61e06d5f8697782e6bedb2d887cea9a
2019-06-04 19:31:22 -07:00
Tri Vo
ca74aef185
Merge "Demote libpower_test to postsubmit" am: 18e20caa81
...
am: 33c2c1f872
Change-Id: Ic8f6d2d477df41d20248eb4fe4a94967a4a22080
2019-06-04 19:25:02 -07:00
Tri Vo
9f7dc4acfc
Merge "libpower: add error logs"
...
am: 9462a528d1
Change-Id: Ie4351e8f245bd41246291cdc4917b4731ef0b2e4
2019-06-04 18:58:08 -07:00
Tri Vo
33c2c1f872
Merge "Demote libpower_test to postsubmit"
...
am: 18e20caa81
Change-Id: I5055e9877c651591456497b2b2ec2d7331333347
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
Bill Rassieur
05302674a4
Merge master@5433138 into git_qt-dev-plus-aosp.
...
am: 9c04c4ac32
Change-Id: Ie708108bf5251b320d545a653400af1c5beb5b3e
2019-04-03 17:57:42 -07:00
Bill Rassieur
9c04c4ac32
Merge master@5433138 into git_qt-dev-plus-aosp.
...
Change-Id: I60c2bd7b1a61324ba4215546d772386522b5f6a0
BUG: 129345239
2019-04-03 22:10:50 +00: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
Change-Id: I266b995a4c863cf84176fc79ed509308148650b5
2019-03-12 15:33:44 -07:00
Jooyung Han
3617f1eb59
Merge "Revert "Mark libhardware_legacy as double_loadable"" am: 0f90ed1ffc
...
am: 1a0ad92fd9
Change-Id: Ic9218d86f5963043e08fa8ab8d87be8601304e58
2019-03-12 15:28:42 -07:00
Jooyung Han
1a0ad92fd9
Merge "Revert "Mark libhardware_legacy as double_loadable""
...
am: 0f90ed1ffc
Change-Id: Ib15b303f5b5f6a8a1e87ee9ba625bfc3ee3e4ffa
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
.
Reason for revert: libhardware_legacy is no longer used by libmediandk(aosp/915075)
Change-Id: I74accc24cf20dae40c29a3b1a2fcd985346143cb
2019-03-11 14:11:02 +00:00
Tri Vo
f6335797c7
Merge "libpower: remove VTS configs" am: 2bd0b3da7e
am: ee40e5225e
...
am: dd7156f26e
Change-Id: I7fea8ae637b7448fd03b88f306363843000e236a
2019-03-01 10:13:36 -08:00
Tri Vo
dd7156f26e
Merge "libpower: remove VTS configs" am: 2bd0b3da7e
...
am: ee40e5225e
Change-Id: I61d6953420519c898b11997ad87f17135b719447
2019-03-01 09:59:08 -08:00
Tri Vo
ee40e5225e
Merge "libpower: remove VTS configs"
...
am: 2bd0b3da7e
Change-Id: I11b3c499224801016ade398f7894ff6426ba8f8e
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
Change-Id: I317089608ec6625026efd4005f563bf7120a678d
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
Change-Id: I22b4ed3261c4441b4307ccf8638df9326bf30ffb
2019-02-13 20:57:17 -08:00