summaryrefslogtreecommitdiffstats
Commit message (Expand)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
|/
* 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
|/
* Merge "libpower: Use AIDL suspend HAL"Kalesh Singh2021-07-232-35/+41
|\
| * libpower: Use AIDL suspend HALKalesh Singh2021-07-222-35/+41
|/
* 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
|\
| * 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
* | | Mark ab/7061308 as merged in stage.Xin Li2021-02-200-0/+0
|\ \ \
| * \ \ Merge "Convert mask types from uint32_t to enum type" am: df5a00d27b am: 1da7...Treehugger Robot2020-12-012-7/+11
| |\ \ \ | | | |/ | | |/|
| * | | Mark ab/6881855 as merged am: 4306b861b2Xin Li2020-11-250-0/+0
| |\ \ \
| * \ \ \ Merge "Update to use new android.system.suspend.control AIDL interface" am: 3...Michael Sun2020-11-062-9/+9
| |\ \ \ \
| | * \ \ \ Merge "Update to use new android.system.suspend.control AIDL interface" am: 3...Michael Sun2020-11-062-9/+9
| | |\ \ \ \
| * | | | | | [automerger skipped] Skip ab/6749736 in stage. am: be29278c3c -s ours am: 64b...Xin Li2020-10-090-0/+0
| |\| | | | |
| | * | | | | [automerger skipped] Skip ab/6749736 in stage. am: be29278c3c -s oursXin Li2020-10-090-0/+0
| | |\ \ \ \ \
| * | | | | | | Merge "block_suspend: avoid CPU spinloop" am: 9a3f98fe6d am: ca1925f900 am: e...Treehugger Robot2020-10-071-1/+3
| |\| | | | | |
| | * | | | | | Merge "block_suspend: avoid CPU spinloop" am: 9a3f98fe6d am: ca1925f900Treehugger Robot2020-10-071-1/+3
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware_legacy" am: afd7...Bob Badour2021-02-192-0/+26
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | 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
|/ / / / / / /
* | | | | | | Merge "Convert mask types from uint32_t to enum type" am: df5a00d27bandroid-s-preview-1Treehugger Robot2020-12-012-7/+11
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | 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
| |/ / / / / /
* | | | | | | Mark ab/6881855 as mergedXin Li2020-11-230-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours am: b8799...Xin Li2020-09-110-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours am: b8799...Xin Li2020-09-110-0/+0
| | |\ \ \ \
| | | * \ \ \ [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours am: b8799...Xin Li2020-09-110-0/+0
| | | |\ \ \ \
| * | | | | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| |\| | | | | |
| | * | | | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | |\| | | | |
| | | * | | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | | |\ \ \ \ \
| * | | | | | | | Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15e a...Glenn Kasten2020-07-011-0/+1
| |\| | | | | | |
| * | | | | | | | Merge "Add METADATA to libhardware_legacy: Apache2=NOTICE" am: 8d345978f3 am:...Treehugger Robot2020-05-041-0/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge "Remove MODULE_LICENSE_APACHE2 from libhardware_legacy" am: dd5a89e9fd ...Treehugger Robot2020-05-041-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge "Update to use new android.system.suspend.control AIDL interface" am: 3...Michael Sun2020-11-062-9/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | 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
|/ / / / / / / / /
* | | | | | | | | Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15e a...Glenn Kasten2020-07-011-0/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
| * | | | | | Merge "Add METADATA to libhardware_legacy: Apache2=NOTICE" am: 8d345978f3 am:...Treehugger Robot2020-05-041-0/+3
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Remove MODULE_LICENSE_APACHE2 from libhardware_legacy" am: dd5a89e9fd ...Treehugger Robot2020-05-041-0/+0
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "block_suspend: avoid CPU spinloop" am: 9a3f98fe6dTreehugger Robot2020-10-071-1/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge "block_suspend: avoid CPU spinloop"Treehugger Robot2020-10-071-1/+3
| |\ \ \ \ \ \
| | * | | | | | block_suspend: avoid CPU spinloopSteven Moreland2020-10-071-1/+3
| |/ / / / / /
* | | | | | / [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s oursXin Li2020-09-110-0/+0
|\| | | | | | | |_|_|_|_|/ |/| | | | |
| * | | | | Merge "Merge Android R"Xin Li2020-09-104-38/+115
| |\ \ \ \ \
| | * | | | | Merge Android RXin Li2020-09-084-38/+115
| |/| | | | | | |/ / / / / |/| | | | |
* | | | | | Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-274-38/+115
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15e a...Glenn Kasten2020-07-011-0/+1
| |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
* | | | Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15eGlenn Kasten2020-07-011-0/+1
|\ \ \ \