Commit graph

1569 commits

Author SHA1 Message Date
Kalesh Singh
fc7f7499c2 Merge "libpower: Use AIDL suspend HAL" 2021-07-23 17:17:03 +00:00
Kalesh Singh
b64a38eee2 libpower: Use AIDL suspend HAL
Use the system susepnd AIDL hal for requesting wakelocks from libpower
or libhardware_legacy.

Bug: 170260236
Test: boot test on cf (suspend blocker works).
Test: libpower_test
Test: block_suspend
Change-Id: I8fc345c33fb893ca11603826b0e993ca908d5b20
2021-07-22 19:57:05 +00:00
Kalesh Singh
e3a6357533 Merge "RAII style wakelocks: Add tryGet() factory method." am: ddff8e6dd0
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1592033

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d63478a6f2956d687971033621360f2abb3b9d2
2021-02-24 22:14:07 +00:00
Kalesh Singh
ddff8e6dd0 Merge "RAII style wakelocks: Add tryGet() factory method." 2021-02-24 18:49:58 +00:00
Kalesh Singh
d8da2af1e5 RAII style wakelocks: Add tryGet() factory method.
Wakelock acquisition can fail if suspend service is not available.
Make this clear by returning an optional value that client must
check before entering wakelock critical sections.

Bug: b/179229598
Test: Boot test on Pixel 4 device
Change-Id: Ied00fa919c20d8a30f1c40ee34a91a2a7e240689
2021-02-23 10:06:19 -05:00
Xin Li
b4d4bcc011 Mark ab/7061308 as merged in stage.
Bug: 180401296
Merged-In: If168d378ac5793e151f2b502b004e4da515865e7
Change-Id: I584355711fa46131ff11fdafdb1cfcc53882796b
2021-02-20 00:24:30 -08:00
Bob Badour
63be865585 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware_legacy" am: afd79930cc
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1588038

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9bc3c423e20e821e7d841b67cbdb6a811fbe25a9
2021-02-19 00:58:45 +00:00
Bob Badour
afd79930cc Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware_legacy" 2021-02-18 23:43:50 +00:00
Bob Badour
9380e9875c [LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware_legacy
Added SPDX-license-identifier-Apache-2.0 to:
  Android.bp
  audio/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Id879ff71929846da71ae2df96ab748a4ad464d82
2021-02-12 16:32:13 -08:00
Treehugger Robot
60185e956c Merge "Convert mask types from uint32_t to enum type" am: df5a00d27b am: 1da7880c26
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1510516

Change-Id: If168d378ac5793e151f2b502b004e4da515865e7
2020-12-01 18:08:52 +00:00
Treehugger Robot
1da7880c26 Merge "Convert mask types from uint32_t to enum type" am: df5a00d27b
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1510516

Change-Id: I1cc5c8b2b2285d5fc6d804e3fe40f47d3c65a91b
2020-12-01 17:42:20 +00:00
Treehugger Robot
df5a00d27b Merge "Convert mask types from uint32_t to enum type" 2020-12-01 17:06:51 +00:00
Xin Li
4b25e69376 Mark ab/6881855 as merged am: 4306b861b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/13111233

Change-Id: I843ea57cb87448fda2806bd72bbd329aabb9be7b
2020-11-25 03:07:52 +00:00
Mikhail Naganov
0fb2f22696 Convert mask types from uint32_t to enum type
This applies to the following types:

- audio_gain_mode_t;
- audio_flags_mask_t;
- audio_channel_representation_t;
- audio_channel_mask_t;
- audio_devices_t.

Enum types are distinct thus proper overloading on the type
is possible in C++. Also, assignments to enum types are
less prone to errors.

Bug: 169889714
Test: basic audio functionality
Change-Id: I6366511b421ccab2782310ecc15a13e08d9c17af
Merged-In: I6366511b421ccab2782310ecc15a13e08d9c17af
2020-11-24 03:42:39 +00:00
Xin Li
4306b861b2 Mark ab/6881855 as merged
Bug: 172690556
Change-Id: Ifea03ad1af58b03086f4527540df09657bf408cd
2020-11-23 11:31:20 -08:00
Michael Sun
cadb0b395e Merge "Update to use new android.system.suspend.control AIDL interface" am: 307c8e8d53 am: 55d8f268a9 am: 2e4633d238
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1480617

Change-Id: I2681b7ad8b87965ff4fe8fd38118ffcfc35d1435
2020-11-06 19:20:04 +00:00
Michael Sun
2e4633d238 Merge "Update to use new android.system.suspend.control AIDL interface" am: 307c8e8d53 am: 55d8f268a9
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1480617

Change-Id: If27d8017873ad3e802b3a57b3d9c5e1069341470
2020-11-06 19:05:53 +00:00
Michael Sun
55d8f268a9 Merge "Update to use new android.system.suspend.control AIDL interface" am: 307c8e8d53
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1480617

Change-Id: I84df993d0c1b15769d60e2dcbf2c86fa66d97195
2020-11-06 17:39:23 +00:00
Michael Sun
307c8e8d53 Merge "Update to use new android.system.suspend.control AIDL interface" 2020-11-06 17:35:58 +00:00
Michael Sun
2ab27a5e1e Update to use new android.system.suspend.control AIDL interface
The suspend_control_aidl_interface is updated, renamed, and splitted
into android.system.suspend.control and
android.system.suspend.control.internal. Update to use the correct
interfaces.

Test: atest libpower_test
Bug: 171598743
Change-Id: I707f5cb868e6756147587e0e097e77ec50995bd4
2020-11-03 04:34:38 +00:00
Xin Li
a4bb7bd5a1 [automerger skipped] Skip ab/6749736 in stage. am: be29278c3c -s ours am: 64b3ae3cad -s ours
am skip reason: Change-Id Ie1c3b77e7aa7b41121aa855e294459e8fc32c58f with SHA-1 1021e13396 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/12797393

Change-Id: I24190625b667a1c6bc3da40ea89822a52f7ee701
2020-10-09 03:42:35 +00:00
Xin Li
64b3ae3cad [automerger skipped] Skip ab/6749736 in stage. am: be29278c3c -s ours
am skip reason: Change-Id Ie1c3b77e7aa7b41121aa855e294459e8fc32c58f with SHA-1 1021e13396 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/12797393

Change-Id: Ic257767606e96e64204868b747198ac216fff046
2020-10-09 03:23:00 +00:00
Xin Li
be29278c3c Skip ab/6749736 in stage.
Merged-In: Ie1c3b77e7aa7b41121aa855e294459e8fc32c58f
Change-Id: Id1d0fa3001c520f80d1f95605f7e13213db562b5
2020-10-08 17:22:38 -07:00
Treehugger Robot
3fe3db2c92 Merge "block_suspend: avoid CPU spinloop" am: 9a3f98fe6d am: ca1925f900 am: e780e61a65
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1453335

Change-Id: I8a893e0603b8b8225728057ca3368f8ac70d713d
2020-10-07 22:57:01 +00:00
Treehugger Robot
e780e61a65 Merge "block_suspend: avoid CPU spinloop" am: 9a3f98fe6d am: ca1925f900
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1453335

Change-Id: I587d0fa6338f9a31be1a04f95efc8f583622cf9a
2020-10-07 22:37:40 +00:00
Treehugger Robot
ca1925f900 Merge "block_suspend: avoid CPU spinloop" am: 9a3f98fe6d
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1453335

Change-Id: I64dc4f201be5a5c37ddfa5194c276a3c421003bd
2020-10-07 22:11:31 +00:00
Treehugger Robot
9a3f98fe6d Merge "block_suspend: avoid CPU spinloop" 2020-10-07 21:58:30 +00:00
Steven Moreland
0e63fb5593 block_suspend: avoid CPU spinloop
For verification of blocked suspend or other unit testing, the spinloop
is fine. However, making it sleep so that it is more viable to assist
with power testing or for any other test where avoiding changes to
device performance is important.

Bug: N/A
Test: run, and ps:
root          4179  4168   18720   4724 __se_sys_nanosleep_time32 0 S block_suspend

Change-Id: I81545ae7db1c1fad2cb94d00456d1a6773868111
2020-10-07 18:03:00 +00:00
Xin Li
4537fb436c [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours am: b8799f91f5 -s ours am: fb376639c3 -s ours am: 12db30c415 -s ours
am skip reason: Change-Id Ia45f259338a1f8255e22c7ba6125e8149eaa9081 with SHA-1 936c77642d is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1422399

Change-Id: I3494c35ec5ed13116ce250afcfbe99c3a8776a81
2020-09-11 03:58:46 +00:00
Xin Li
12db30c415 [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours am: b8799f91f5 -s ours am: fb376639c3 -s ours
am skip reason: Change-Id Ia45f259338a1f8255e22c7ba6125e8149eaa9081 with SHA-1 936c77642d is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1422399

Change-Id: I0245f892a00f5c51c8d0a0d9bdf2e53de833b6ec
2020-09-11 03:33:15 +00:00
Xin Li
fb376639c3 [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours am: b8799f91f5 -s ours
am skip reason: Change-Id Ia45f259338a1f8255e22c7ba6125e8149eaa9081 with SHA-1 936c77642d is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1422399

Change-Id: I7d8055b131b1a51714aca201f347a5e3f36028eb
2020-09-11 02:02:24 +00:00
Xin Li
b8799f91f5 [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours
am skip reason: Change-Id Ia45f259338a1f8255e22c7ba6125e8149eaa9081 with SHA-1 936c77642d is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1422399

Change-Id: Iee6dab710c007de5b0f841a87004163aa2fc3e28
2020-09-11 00:39:43 +00:00
Xin Li
cff73710d4 Merge "Merge Android R" 2020-09-10 17:22:41 +00:00
Xin Li
5c585b6aed Merge Android R
Bug: 168057903
Merged-In: Ia45f259338a1f8255e22c7ba6125e8149eaa9081
Change-Id: I780a337f81956c8fb9b33b2034e62f89ac3cf3e0
2020-09-08 16:55:30 -07:00
Xin Li
8f8ba91d47 [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 936c77642d -s ours am: aa6ee6a69a -s ours am: ea9f4a294f -s ours
am skip reason: Change-Id I5081765a1f7067786819df994029cd37a56ec570 with SHA-1 241bea678f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/12470018

Change-Id: Iaadab5c4458d21648f7885078030853357dff132
2020-09-01 22:09:43 +00:00
Xin Li
ea9f4a294f [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 936c77642d -s ours am: aa6ee6a69a -s ours
am skip reason: Change-Id I5081765a1f7067786819df994029cd37a56ec570 with SHA-1 241bea678f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/12470018

Change-Id: I7c30a598562fcdce228fa715621e79a4981718f6
2020-09-01 21:46:28 +00:00
Xin Li
aa6ee6a69a [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 936c77642d -s ours
am skip reason: Change-Id I5081765a1f7067786819df994029cd37a56ec570 with SHA-1 241bea678f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/12470018

Change-Id: I0ce66766b166fc58d5408d4b7bc44732bd8eb7f0
2020-09-01 20:36:53 +00:00
Xin Li
936c77642d Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I5081765a1f7067786819df994029cd37a56ec570
Change-Id: Ia45f259338a1f8255e22c7ba6125e8149eaa9081
2020-08-27 10:16:42 -07:00
Glenn Kasten
997cf74b26 Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15e am: f1c3aef751 am: 241bea678f am: 1021e13396
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1353827

Change-Id: I311140709697779fe38376257f9ecc9ffc5d2bdd
2020-07-01 23:49:52 +00:00
Glenn Kasten
1021e13396 Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15e am: f1c3aef751 am: 241bea678f
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1353827

Change-Id: Ie1c3b77e7aa7b41121aa855e294459e8fc32c58f
2020-07-01 23:35:22 +00:00
Glenn Kasten
241bea678f Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15e am: f1c3aef751
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1353827

Change-Id: I5081765a1f7067786819df994029cd37a56ec570
2020-07-01 23:11:01 +00:00
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
36d3a725e5 Merge "Add METADATA to libhardware_legacy: Apache2=NOTICE" am: 8d345978f3 am: 16d0ab9898 am: 23e327fdfd am: 091508d4a9
Change-Id: I201e57b099c6ba87f7bb246abf3f64455d5f75e3
2020-05-04 20:44:27 +00:00
Treehugger Robot
439a7ff027 Merge "Remove MODULE_LICENSE_APACHE2 from libhardware_legacy" am: dd5a89e9fd am: 0cee190367 am: 4d91ff3f1f am: 6aa4d874cd
Change-Id: I2204a0a9e6bee7fdf95a96f4787578a37b41cdac
2020-05-04 20:43:58 +00:00
Treehugger Robot
091508d4a9 Merge "Add METADATA to libhardware_legacy: Apache2=NOTICE" am: 8d345978f3 am: 16d0ab9898 am: 23e327fdfd
Change-Id: Iae310a0b593cc4d394f6e33ee595b03c8b6f8850
2020-05-04 20:23:42 +00:00
Treehugger Robot
6aa4d874cd Merge "Remove MODULE_LICENSE_APACHE2 from libhardware_legacy" am: dd5a89e9fd am: 0cee190367 am: 4d91ff3f1f
Change-Id: I8520c946a8bcb199b2fa0ee17d8eb09b231373bf
2020-05-04 20:23:14 +00:00
Treehugger Robot
23e327fdfd Merge "Add METADATA to libhardware_legacy: Apache2=NOTICE" am: 8d345978f3 am: 16d0ab9898
Change-Id: I2510dd9ff0f35134c4d2dbdaf4f44d97eac172cd
2020-05-04 20:01:25 +00:00
Treehugger Robot
4d91ff3f1f Merge "Remove MODULE_LICENSE_APACHE2 from libhardware_legacy" am: dd5a89e9fd am: 0cee190367
Change-Id: I9b9ad4fe73f3b34760823f8b83d3106ed3d9799c
2020-05-04 20:01:19 +00:00