summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove ndk_platform backend. Use the ndk backend."HEADandroid-s-beta-5masterandroid-s-beta-5Steven Moreland2021-08-251-4/+4
|\
| * Remove ndk_platform backend. Use the ndk backend.Jiyong Park2021-08-091-4/+4
|/ | | | | | | | | | | The ndk_platform backend will soon be deprecated because the ndk backend can serve the same purpose. This is to eliminate the confusion about having two variants (ndk and ndk_platform) for the same ndk backend. Bug: 161456198 Test: m Merged-In: Ifadc89ec1cdb32dc39d5639665167c7bae336836 Change-Id: I99947e7fc58b5f6ab7d75f2af63b6bf9384917c3
* Merge "libpower: Check if suspend service is null"Kalesh Singh2021-08-041-2/+7
|\
| * libpower: Check if suspend service is nullKalesh Singh2021-08-041-2/+7
|/ | | | | | | | | | | Before requesting wakelock ensure that we have a valid suspend service. Use waitForService instead of checkService. Test: libpower_test Test: block_suspend Test: atest NexusLauncherOutOfProcTests:MemoryTests#testAppLaunchFromWorkspace --rerun-until-failure 10 Bug: 195319784 Change-Id: If13e233360a7b5f372dd2991c1891ee0bee8544b
* Merge "libpower: Use AIDL suspend HAL"Kalesh Singh2021-07-232-35/+41
|\
| * libpower: Use AIDL suspend HALKalesh Singh2021-07-222-35/+41
|/ | | | | | | | | | | 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
* Merge "RAII style wakelocks: Add tryGet() factory method." am: ddff8e6dd0android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Kalesh Singh2021-02-244-8/+45
|\ | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1592033 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1d63478a6f2956d687971033621360f2abb3b9d2
| * Merge "RAII style wakelocks: Add tryGet() factory method."Kalesh Singh2021-02-244-8/+45
| |\
| | * RAII style wakelocks: Add tryGet() factory method.Kalesh Singh2021-02-234-8/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Mark ab/7061308 as merged in stage.Xin Li2021-02-200-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | Bug: 180401296 Merged-In: If168d378ac5793e151f2b502b004e4da515865e7 Change-Id: I584355711fa46131ff11fdafdb1cfcc53882796b
| * \ \ Merge "Convert mask types from uint32_t to enum type" am: df5a00d27b am: ↵Treehugger Robot2020-12-012-7/+11
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | 1da7880c26 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1510516 Change-Id: If168d378ac5793e151f2b502b004e4da515865e7
| * | | Mark ab/6881855 as merged am: 4306b861b2Xin Li2020-11-250-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/13111233 Change-Id: I843ea57cb87448fda2806bd72bbd329aabb9be7b
| * \ \ \ Merge "Update to use new android.system.suspend.control AIDL interface" am: ↵Michael Sun2020-11-062-9/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 307c8e8d53 am: 55d8f268a9 am: 2e4633d238 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1480617 Change-Id: I2681b7ad8b87965ff4fe8fd38118ffcfc35d1435
| | * \ \ \ Merge "Update to use new android.system.suspend.control AIDL interface" am: ↵Michael Sun2020-11-062-9/+9
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 307c8e8d53 am: 55d8f268a9 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1480617 Change-Id: If27d8017873ad3e802b3a57b3d9c5e1069341470
| * | | | | | [automerger skipped] Skip ab/6749736 in stage. am: be29278c3c -s ours am: ↵Xin Li2020-10-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | [automerger skipped] Skip ab/6749736 in stage. am: be29278c3c -s oursXin Li2020-10-090-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Merge "block_suspend: avoid CPU spinloop" am: 9a3f98fe6d am: ca1925f900 am: ↵Treehugger Robot2020-10-071-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e780e61a65 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1453335 Change-Id: I8a893e0603b8b8225728057ca3368f8ac70d713d
| | * | | | | | Merge "block_suspend: avoid CPU spinloop" am: 9a3f98fe6d am: ca1925f900Treehugger Robot2020-10-071-1/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1453335 Change-Id: I587d0fa6338f9a31be1a04f95efc8f583622cf9a
* | | \ \ \ \ \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware_legacy" am: ↵Bob Badour2021-02-192-0/+26
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afd79930cc Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1588038 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9bc3c423e20e821e7d841b67cbdb6a811fbe25a9
| * | | | | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware_legacy"Bob Badour2021-02-182-0/+26
|/| | | | | | |
| * | | | | | | [LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware_legacyBob Badour2021-02-122-0/+26
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Convert mask types from uint32_t to enum type" am: df5a00d27bandroid-s-preview-1Treehugger Robot2020-12-012-7/+11
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1510516 Change-Id: I1cc5c8b2b2285d5fc6d804e3fe40f47d3c65a91b
| * | | | | | Merge "Convert mask types from uint32_t to enum type"Treehugger Robot2020-12-012-7/+11
| |\ \ \ \ \ \
| | * | | | | | Convert mask types from uint32_t to enum typeMikhail Naganov2020-11-242-7/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Mark ab/6881855 as mergedXin Li2020-11-230-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | | Bug: 172690556 Change-Id: Ifea03ad1af58b03086f4527540df09657bf408cd
| * | | | | [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours am: ↵Xin Li2020-09-110-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours am: ↵Xin Li2020-09-110-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * \ \ \ [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours am: ↵Xin Li2020-09-110-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | [automerger skipped] Merge Android R ↵Xin Li2020-09-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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
| | * | | | | | [automerger skipped] Merge Android R ↵Xin Li2020-09-010-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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
| | | * | | | | [automerger skipped] Merge Android R ↵Xin Li2020-09-010-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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
| * | | | | | | | Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15e ↵Glenn Kasten2020-07-011-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f1c3aef751 am: 241bea678f am: 1021e13396 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1353827 Change-Id: I311140709697779fe38376257f9ecc9ffc5d2bdd
| * | | | | | | | Merge "Add METADATA to libhardware_legacy: Apache2=NOTICE" am: 8d345978f3 ↵Treehugger Robot2020-05-041-0/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 16d0ab9898 am: 23e327fdfd am: 091508d4a9 Change-Id: I201e57b099c6ba87f7bb246abf3f64455d5f75e3
| * \ \ \ \ \ \ \ \ Merge "Remove MODULE_LICENSE_APACHE2 from libhardware_legacy" am: dd5a89e9fd ↵Treehugger Robot2020-05-041-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0cee190367 am: 4d91ff3f1f am: 6aa4d874cd Change-Id: I2204a0a9e6bee7fdf95a96f4787578a37b41cdac
* | \ \ \ \ \ \ \ \ \ Merge "Update to use new android.system.suspend.control AIDL interface" am: ↵Michael Sun2020-11-062-9/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 307c8e8d53 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1480617 Change-Id: I84df993d0c1b15769d60e2dcbf2c86fa66d97195
| * | | | | | | | | Merge "Update to use new android.system.suspend.control AIDL interface"Michael Sun2020-11-062-9/+9
|/| | | | | | | | |
| * | | | | | | | | Update to use new android.system.suspend.control AIDL interfaceMichael Sun2020-11-032-9/+9
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | Merged-In: Ie1c3b77e7aa7b41121aa855e294459e8fc32c58f Change-Id: Id1d0fa3001c520f80d1f95605f7e13213db562b5
| * | | | | | | Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15e ↵Glenn Kasten2020-07-011-0/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | am: f1c3aef751 am: 241bea678f Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1353827 Change-Id: Ie1c3b77e7aa7b41121aa855e294459e8fc32c58f
| * | | | | | Merge "Add METADATA to libhardware_legacy: Apache2=NOTICE" am: 8d345978f3 ↵Treehugger Robot2020-05-041-0/+3
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | am: 16d0ab9898 am: 23e327fdfd Change-Id: Iae310a0b593cc4d394f6e33ee595b03c8b6f8850
| * | | | | | Merge "Remove MODULE_LICENSE_APACHE2 from libhardware_legacy" am: dd5a89e9fd ↵Treehugger Robot2020-05-041-0/+0
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | am: 0cee190367 am: 4d91ff3f1f Change-Id: I8520c946a8bcb199b2fa0ee17d8eb09b231373bf
* | | | | | | Merge "block_suspend: avoid CPU spinloop" am: 9a3f98fe6dTreehugger Robot2020-10-071-1/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1453335 Change-Id: I64dc4f201be5a5c37ddfa5194c276a3c421003bd
| * | | | | | Merge "block_suspend: avoid CPU spinloop"Treehugger Robot2020-10-071-1/+3
| |\ \ \ \ \ \
| | * | | | | | block_suspend: avoid CPU spinloopSteven Moreland2020-10-071-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | / [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s oursXin Li2020-09-110-0/+0
|\| | | | | | | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Merge "Merge Android R"Xin Li2020-09-104-38/+115
| |\ \ \ \ \
| | * | | | | Merge Android RXin Li2020-09-084-38/+115
| |/| | | | | | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 168057903 Merged-In: Ia45f259338a1f8255e22c7ba6125e8149eaa9081 Change-Id: I780a337f81956c8fb9b33b2034e62f89ac3cf3e0
* | | | | | Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-274-38/+115
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | Bug: 166295507 Merged-In: I5081765a1f7067786819df994029cd37a56ec570 Change-Id: Ia45f259338a1f8255e22c7ba6125e8149eaa9081
| * | | | Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15e ↵Glenn Kasten2020-07-011-0/+1
| |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | am: f1c3aef751 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1353827 Change-Id: I5081765a1f7067786819df994029cd37a56ec570
* | | | Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15eGlenn Kasten2020-07-011-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1353827 Change-Id: Ibbe1d358bf78ecd8900e9a38dacd0d60b25a6fbc
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-02 19:32:55 +0000