Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Remove ndk_platform backend. Use the ndk backend."HEADandroid-s-beta-5masterandroid-s-beta-5 | Steven Moreland | 2021-08-25 | 1 | -4/+4 |
|\ | |||||
| * | Remove ndk_platform backend. Use the ndk backend. | Jiyong Park | 2021-08-09 | 1 | -4/+4 |
|/ | |||||
* | Merge "libpower: Check if suspend service is null" | Kalesh Singh | 2021-08-04 | 1 | -2/+7 |
|\ | |||||
| * | libpower: Check if suspend service is null | Kalesh Singh | 2021-08-04 | 1 | -2/+7 |
|/ | |||||
* | Merge "libpower: Use AIDL suspend HAL" | Kalesh Singh | 2021-07-23 | 2 | -35/+41 |
|\ | |||||
| * | libpower: Use AIDL suspend HAL | Kalesh Singh | 2021-07-22 | 2 | -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-4 | Kalesh Singh | 2021-02-24 | 4 | -8/+45 |
|\ | |||||
| * | Merge "RAII style wakelocks: Add tryGet() factory method." | Kalesh Singh | 2021-02-24 | 4 | -8/+45 |
| |\ | |||||
| | * | RAII style wakelocks: Add tryGet() factory method. | Kalesh Singh | 2021-02-23 | 4 | -8/+45 |
* | | | Mark ab/7061308 as merged in stage. | Xin Li | 2021-02-20 | 0 | -0/+0 |
|\ \ \ | |||||
| * \ \ | Merge "Convert mask types from uint32_t to enum type" am: df5a00d27b am: 1da7... | Treehugger Robot | 2020-12-01 | 2 | -7/+11 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Mark ab/6881855 as merged am: 4306b861b2 | Xin Li | 2020-11-25 | 0 | -0/+0 |
| |\ \ \ | |||||
| * \ \ \ | Merge "Update to use new android.system.suspend.control AIDL interface" am: 3... | Michael Sun | 2020-11-06 | 2 | -9/+9 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge "Update to use new android.system.suspend.control AIDL interface" am: 3... | Michael Sun | 2020-11-06 | 2 | -9/+9 |
| | |\ \ \ \ | |||||
| * | | | | | | [automerger skipped] Skip ab/6749736 in stage. am: be29278c3c -s ours am: 64b... | Xin Li | 2020-10-09 | 0 | -0/+0 |
| |\| | | | | | |||||
| | * | | | | | [automerger skipped] Skip ab/6749736 in stage. am: be29278c3c -s ours | Xin Li | 2020-10-09 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| * | | | | | | | Merge "block_suspend: avoid CPU spinloop" am: 9a3f98fe6d am: ca1925f900 am: e... | Treehugger Robot | 2020-10-07 | 1 | -1/+3 |
| |\| | | | | | | |||||
| | * | | | | | | Merge "block_suspend: avoid CPU spinloop" am: 9a3f98fe6d am: ca1925f900 | Treehugger Robot | 2020-10-07 | 1 | -1/+3 |
| | |\ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ | Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware_legacy" am: afd7... | Bob Badour | 2021-02-19 | 2 | -0/+26 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware_legacy" | Bob Badour | 2021-02-18 | 2 | -0/+26 |
|/| | | | | | | | |||||
| * | | | | | | | [LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware_legacy | Bob Badour | 2021-02-12 | 2 | -0/+26 |
|/ / / / / / / | |||||
* | | | | | | | Merge "Convert mask types from uint32_t to enum type" am: df5a00d27bandroid-s-preview-1 | Treehugger Robot | 2020-12-01 | 2 | -7/+11 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Merge "Convert mask types from uint32_t to enum type" | Treehugger Robot | 2020-12-01 | 2 | -7/+11 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Convert mask types from uint32_t to enum type | Mikhail Naganov | 2020-11-24 | 2 | -7/+11 |
| |/ / / / / / | |||||
* | | | | | | | Mark ab/6881855 as merged | Xin Li | 2020-11-23 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours am: b8799... | Xin Li | 2020-09-11 | 0 | -0/+0 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours am: b8799... | Xin Li | 2020-09-11 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours am: b8799... | Xin Li | 2020-09-11 | 0 | -0/+0 |
| | | |\ \ \ \ | |||||
| * | | | | | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270... | Xin Li | 2020-09-01 | 0 | -0/+0 |
| |\| | | | | | | |||||
| | * | | | | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270... | Xin Li | 2020-09-01 | 0 | -0/+0 |
| | |\| | | | | | |||||
| | | * | | | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270... | Xin Li | 2020-09-01 | 0 | -0/+0 |
| | | |\ \ \ \ \ | |||||
| * | | | | | | | | Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15e a... | Glenn Kasten | 2020-07-01 | 1 | -0/+1 |
| |\| | | | | | | | |||||
| * | | | | | | | | Merge "Add METADATA to libhardware_legacy: Apache2=NOTICE" am: 8d345978f3 am:... | Treehugger Robot | 2020-05-04 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge "Remove MODULE_LICENSE_APACHE2 from libhardware_legacy" am: dd5a89e9fd ... | Treehugger Robot | 2020-05-04 | 1 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Merge "Update to use new android.system.suspend.control AIDL interface" am: 3... | Michael Sun | 2020-11-06 | 2 | -9/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge "Update to use new android.system.suspend.control AIDL interface" | Michael Sun | 2020-11-06 | 2 | -9/+9 |
|/| | | | | | | | | | |||||
| * | | | | | | | | | Update to use new android.system.suspend.control AIDL interface | Michael Sun | 2020-11-03 | 2 | -9/+9 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Skip ab/6749736 in stage. | Xin Li | 2020-10-08 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15e a... | Glenn Kasten | 2020-07-01 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge "Add METADATA to libhardware_legacy: Apache2=NOTICE" am: 8d345978f3 am:... | Treehugger Robot | 2020-05-04 | 1 | -0/+3 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge "Remove MODULE_LICENSE_APACHE2 from libhardware_legacy" am: dd5a89e9fd ... | Treehugger Robot | 2020-05-04 | 1 | -0/+0 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge "block_suspend: avoid CPU spinloop" am: 9a3f98fe6d | Treehugger Robot | 2020-10-07 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Merge "block_suspend: avoid CPU spinloop" | Treehugger Robot | 2020-10-07 | 1 | -1/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | block_suspend: avoid CPU spinloop | Steven Moreland | 2020-10-07 | 1 | -1/+3 |
| |/ / / / / / | |||||
* | | | | | / | [automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours | Xin Li | 2020-09-11 | 0 | -0/+0 |
|\| | | | | | | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Merge "Merge Android R" | Xin Li | 2020-09-10 | 4 | -38/+115 |
| |\ \ \ \ \ | |||||
| | * | | | | | Merge Android R | Xin Li | 2020-09-08 | 4 | -38/+115 |
| |/| | | | | | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) | Xin Li | 2020-08-27 | 4 | -38/+115 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | |||||
| * | | | | Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15e a... | Glenn Kasten | 2020-07-01 | 1 | -0/+1 |
| |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
* | | | | Merge "Include what you use: <cutils/bitops.h> for popcount" am: a44935a15e | Glenn Kasten | 2020-07-01 | 1 | -0/+1 |
|\ \ \ \ |