Glenn Kasten
f1c3aef751
Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15e
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1353827
Change-Id: Ibbe1d358bf78ecd8900e9a38dacd0d60b25a6fbc
2020-07-01 22:56:38 +00:00
Glenn Kasten
a44935a15e
Merge "Include what you use: <cutils/bitops.h> for popcount"
2020-07-01 22:40:40 +00:00
Glenn Kasten
75957b03d2
Include what you use: <cutils/bitops.h> for popcount
...
Test: builds OK
Change-Id: Ia469ef1b53b96e14a348405f269009c93394661e
2020-07-01 12:18:21 -07:00
Treehugger Robot
16d0ab9898
Merge "Add METADATA to libhardware_legacy: Apache2=NOTICE" am: 8d345978f3
...
Change-Id: I7548b932b18f284cd7853f6822019eea157b98f3
2020-05-04 19:45:40 +00:00
Treehugger Robot
0cee190367
Merge "Remove MODULE_LICENSE_APACHE2 from libhardware_legacy" am: dd5a89e9fd
...
Change-Id: I7e5168450c852c8dcf6f8bf2a33266e29118ca8e
2020-05-04 19:45:31 +00:00
Treehugger Robot
8d345978f3
Merge "Add METADATA to libhardware_legacy: Apache2=NOTICE"
2020-05-04 19:37:36 +00:00
Treehugger Robot
dd5a89e9fd
Merge "Remove MODULE_LICENSE_APACHE2 from libhardware_legacy"
2020-05-04 19:37:31 +00:00
Bob Badour
2fcc38e175
Add METADATA to libhardware_legacy: Apache2=NOTICE
...
Bug: 68860345
Bug: 69058154
Bug: 151953481
Test: no code changes
Change-Id: Ic411df7dc27fb93c757ff989c1e056efecb8ee1b
2020-05-01 10:03:37 -07:00
Bob Badour
49a2e9d5a8
Remove MODULE_LICENSE_APACHE2 from libhardware_legacy
...
Repositories containing third-party code need a METADATA and a
license_type. Repositories containing only first-party code no longer
need a MODULE_LICENSE_* file.
Bug: 68860345
Bug: 69058154
Bug: 151953481
Test: no code changes
Change-Id: I95a3e4f05aab09276311fcc6cc4363eebc4f77f8
2020-04-27 20:45:45 -07:00
Tri Vo
f2a03b6762
Merge "block_suspend: test util to block suspend from shell" am: 52e6536018
...
am: 89e661c090
Change-Id: Ia8108fc5ccf32b957438c3fbc14d87a1015d04ea
2019-11-12 14:17:45 -08:00
Tri Vo
89e661c090
Merge "block_suspend: test util to block suspend from shell"
...
am: 52e6536018
Change-Id: I58fc561e0bfd7db1b6f4765bf28ce9094e218f63
2019-11-12 14:14:12 -08:00
Tri Vo
52e6536018
Merge "block_suspend: test util to block suspend from shell"
2019-11-12 22:01:53 +00:00
Tri Vo
032365882b
block_suspend: test util to block suspend from shell
...
Bug: 143284916
Test: ./block_suspend; dumpsys suspend_control shows that wakelocks are
created as expected
Change-Id: Ifacb4f476632e0c36f7ec4f59164f91e89faf1f1
2019-11-11 12:32:59 -08:00
Xin Li
fc3970790d
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
am: 3868c63c15
Change-Id: I2d0436edc5b1a8fbba1c9841880601bd8e0eb31b
2019-10-30 15:15:02 -07:00
Xin Li
3868c63c15
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
Bug: 142003500
Change-Id: Icd25c16e736e1f5856b7f276b59f20fa99b1af84
2019-10-30 11:49:27 -07:00
Xin Li
9d1dd12c34
[automerger skipped] Merge Coral/Flame into AOSP master am: 0ed99eca92
-s ours am: d784d83f2b
-s ours
...
am: fc94ff1e86
-s ours
am skip reason: change_id Ife2ba92f4c3c2bad08db288db184ba25bf52e4ad with SHA1 1fd1efbd2e
is in history
Change-Id: I27db65e7d4587d8a9e6497d7c6eb368fa7425b08
2019-10-26 22:31:09 -07:00
Xin Li
fc94ff1e86
[automerger skipped] Merge Coral/Flame into AOSP master am: 0ed99eca92
-s ours
...
am: d784d83f2b
-s ours
am skip reason: change_id Ife2ba92f4c3c2bad08db288db184ba25bf52e4ad with SHA1 1fd1efbd2e
is in history
Change-Id: I70de5e1edfa94765755a99529ae32bfc01467215
2019-10-26 22:24:12 -07:00
Xin Li
d784d83f2b
[automerger skipped] Merge Coral/Flame into AOSP master
...
am: 0ed99eca92
-s ours
am skip reason: change_id Ife2ba92f4c3c2bad08db288db184ba25bf52e4ad with SHA1 1fd1efbd2e
is in history
Change-Id: I48408dc078cd0c7e0cd2451a9a3739bcbe9db0f2
2019-10-26 22:07:51 -07:00
Xin Li
0ed99eca92
Merge Coral/Flame into AOSP master
...
Bug: 141248619
Change-Id: I0a7a391d1cdee18630ca014b0664487e4c06280f
Merged-In: Ife2ba92f4c3c2bad08db288db184ba25bf52e4ad
2019-10-25 10:28:01 -07:00
Xin Li
16e61163b9
Skip QD1A.190821.011 in stage-aosp-master am: 1fd1efbd2e
...
am: 370369fcc8
Change-Id: I6a9cb021913015d85fe778c03814ee515d1b02e0
2019-10-18 13:08:24 -07:00
Xin Li
370369fcc8
Skip QD1A.190821.011 in stage-aosp-master
...
am: 1fd1efbd2e
Change-Id: I9d9a479cb476474c947150a258ae374943900643
2019-10-18 12:48:23 -07:00
Xin Li
1fd1efbd2e
Skip QD1A.190821.011 in stage-aosp-master
...
Bug: 141248619
Change-Id: Ife2ba92f4c3c2bad08db288db184ba25bf52e4ad
2019-10-16 15:19:21 -07:00
Marco Nelissen
63d0a63bcd
Merge "libaudiohw_legacy needs libaudioclient_headers" am: 97a11597b6
am: 00eef5e988
...
am: 090928ffd1
Change-Id: I55ed13a69d1c05fccb233b4843497dc97d140ea4
2019-10-08 12:49:08 -07:00
Marco Nelissen
090928ffd1
Merge "libaudiohw_legacy needs libaudioclient_headers" am: 97a11597b6
...
am: 00eef5e988
Change-Id: If0ccfec8730ed0fbe414575681bbb36932a6b827
2019-10-08 12:42:34 -07:00
Marco Nelissen
00eef5e988
Merge "libaudiohw_legacy needs libaudioclient_headers"
...
am: 97a11597b6
Change-Id: I0e571a7da2b9e93dbe3cf32882cc25f165a456b2
2019-10-08 12:35:35 -07:00
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
6cad819893
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: ca8f152649
-s ours
...
am: ebb1107166
-s ours
am skip reason: change_id Ieb5298f552c800e60647be5a75f754f0df5b374d with SHA1 bdb5c17e60
is in history
Change-Id: I47b5241278fe73d32debe317414fa99ce7c02e59
2019-09-11 14:52:27 -07:00
Xin Li
ebb1107166
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
am: ca8f152649
-s ours
am skip reason: change_id Ieb5298f552c800e60647be5a75f754f0df5b374d with SHA1 bdb5c17e60
is in history
Change-Id: I836f47c4355643e17bff2a6949313f68ac26cd77
2019-09-11 14:04:42 -07:00
Xin Li
ca8f152649
Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
Bug: 135460123
Change-Id: I4a95f6b87c4bd29b5b47531e6153315db52019f2
Merged-In: Ieb5298f552c800e60647be5a75f754f0df5b374d
2019-09-08 13:06:54 -07:00
Xin Li
b97b666c3b
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 8eb6e081d4
-s ours am: aba674b466
...
am: a43f9f02fc
Change-Id: Ie20900ff13531453b8c9f9f9c1b3b69b41fd0bd4
2019-09-05 13:30:02 -07:00
Xin Li
a43f9f02fc
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 8eb6e081d4
-s ours
...
am: aba674b466
Change-Id: I6ba0ec377ffc15f44678a8134c6746003e60314e
2019-09-05 12:50:52 -07:00
Xin Li
aba674b466
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
...
am: 8eb6e081d4
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie3914e1c5861e05c8a58f6615aaa7b943f395397
2019-09-05 12:04:12 -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
android-build-team Robot
040bebb1b9
Snap for 5746716 from 36c48e4023
to qt-c2f2-release
...
Change-Id: I4e6375053e6ba7a693067863d19a53bdf14f55d6
2019-07-23 03:11:40 +00:00
Tri Vo
e06086319a
DO NOT MERGE Demote libpower_test to postsubmit
...
am: 36c48e4023
Change-Id: Ie735752a564abba8a3bb1828c0cd9ae599df9504
2019-07-22 11:48:05 -07:00
Tri Vo
36c48e4023
DO NOT MERGE 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: 137888802
Test: n/a
Change-Id: Ieb87e3275289b11f843c18343e5d50a41c7b1993
(cherry picked from commit 329dbd296d
)
2019-07-19 18:27:56 +00:00
Xin Li
1f43543fa6
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: e6bfce1fab
Change-Id: I887d7ec60945db4c883794996b7a8f6f760919dd
2019-07-02 13:21:54 -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
22eee32b19
Merge "libpower: RAII wake lock implementation" am: a53a8a7193
am: aac0a1f5d3
...
am: 2843fd5f4a
Change-Id: Ia4dff35ba25bafba4b6ef031e427505136306767
2019-06-27 09:12:26 -07:00
Tri Vo
2843fd5f4a
Merge "libpower: RAII wake lock implementation" am: a53a8a7193
...
am: aac0a1f5d3
Change-Id: Ie501bc93adbeb28fb364772b92d47427c46ad677
2019-06-26 19:43:16 -07:00
Tri Vo
aac0a1f5d3
Merge "libpower: RAII wake lock implementation"
...
am: a53a8a7193
Change-Id: Ib3347ed0e77073dda888a5bd126190d9e8ad8bf1
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
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
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