summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-10-05Merge "Fix NDK documentation minor bugs." into main am: 19dd476618tmp_amf_298295554Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2773889 Change-Id: I2117a4a93b3c93e3a4189fea84709f47da0c9540 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge "Fix NDK documentation minor bugs." into mainTreehugger Robot
2023-10-05Fix NDK documentation minor bugs.Sally Qi
Bug: 300602767 Change-Id: I114a4cf83978f152959a6ec244d322603ff5257b Test: builds
2023-10-05Merge "Add prebuilt_etc for consumerir feature xml" into main am: fe0c71f1e2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2752129 Change-Id: I7e0d946f72d78b863f622fb914033b197a48823a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge "Add prebuilt_etc for consumerir feature xml" into mainTreehugger Robot
2023-10-03Merge "dumpstate: call printflags instead of reading flag files explicitly" ↵Mårten Kongstad
into main am: efed5f1359 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2766885 Change-Id: Ib4c943a7d95f32f04931ff68ef70af768c423a72 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Merge "dumpstate: call printflags instead of reading flag files explicitly" ↵Mårten Kongstad
into main
2023-10-02Merge "inputflinger: add missing <functional> include" into main am: 3508150e04Ryan Prichard
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2758333 Change-Id: I932d2b1d79f435769976d7d2916cfb73c51123a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02Merge "inputflinger: add missing <functional> include" into mainRyan Prichard
2023-09-29Merge "Merge UP1A.231005.007" into aosp-main-futureXin Li
2023-09-29Merge "make it clear mGpuMemTotalMap is R/O" into main am: ecf372879bMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2765953 Change-Id: I75fe2c630cdbbb92f04880684916358e1d709700 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29Merge "make it clear mGpuMemTotalMap is R/O" into mainMaciej Żenczykowski
2023-09-29Merge "use BpfMap's resetMap() for creating new maps" into main am: 838d7aeaefTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2766745 Change-Id: I98b72f678573e5b2e03f35f5f6616181a3ed78f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29Merge "use BpfMap's resetMap() for creating new maps" into mainTreehugger Robot
2023-09-28Merge "Add tmp file to ramdom_fd for parcel fuzzing" into main am: e69355e45cSteven Moreland
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2748135 Change-Id: I671852453961d65f4f43a68f34f57787c2c157b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28Merge "Add tmp file to ramdom_fd for parcel fuzzing" into mainSteven Moreland
2023-09-28Merge UP1A.231005.007Xin Li
Bug: 291102124 Merged-In: Ib39ba935727df0bc1ab4030bcfe8301de7e64805 Change-Id: Ic96a1854bcb1071da9b3eebdf3a63fe17d5c9c6f
2023-09-28dumpstate: call printflags instead of reading flag files explicitlyMårten Kongstad
Now that the printflags device tool exists, dumpstate no longer needs to read the aconfig files itself. Teach dumpstate to call printflags instead. As a bonus, printflags will also include the current flag values as defined by device_config. Bug: 302452801 Test: adb bugreport /tmp/bugreport.zip && unzip -c /tmp/bugreport.zip bugreport*.txt | grep --text -A20 -e 'ACONFIG FLAGS' Change-Id: I6be4aab8dad6e08d2bc0e646224b3682927e34a2
2023-09-28make it clear mGpuMemTotalMap is R/OMaciej Żenczykowski
Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I0484c629a02b84b59ca19b35e24a6496fbfd0990
2023-09-28use BpfMap's resetMap() for creating new mapsMaciej Żenczykowski
Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I0f837dd358e8bbcb601b2d5e7e2757f60154c1cb
2023-09-27Merge "Add additional instance info to log" into main am: da7ca1417cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2764465 Change-Id: Id7d5ef4e5ec5e3739ea458aded45047a57c92897 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27Merge "Add additional instance info to log" into mainTreehugger Robot
2023-09-27Merge "Use ro.vndk.version to check if VNDK is deprecated" into main am: ↵Kiyoung Kim
553da45cd7 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2762765 Change-Id: I0a52a64a0d8e27cbe90ea88115abf4bef9609ff6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27Merge "Use ro.vndk.version to check if VNDK is deprecated" into mainKiyoung Kim
2023-09-26inputflinger: add missing <functional> includeRyan Prichard
Bug: 175635923 Test: treehugger Change-Id: Ieb7828b26613c3b5470c9b76f31ad1b6b09d9445 Merged-In: Ieb7828b26613c3b5470c9b76f31ad1b6b09d9445
2023-09-26Add additional instance info to logDevin Moore
When an instance can't be found, we now log the available instances. This can help debugging when the instance name is misspelled or the manifest fragment file wasn't included. Test: launch_cvd && and logcat | grep "Could not find" Test: atest servicemanager_test Bug: 302147119 Change-Id: Iad85903d82bbd45c012b007ba1fcf059c5cd5c4a
2023-09-26Merge "tracing: Allow access to a couple more binder events" into main am: ↵Daniele Di Proietto
e3e03441fc Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2761587 Change-Id: I2faa9efc3fab78100587d6bd02f4dc546c4b91d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26Merge "tracing: Allow access to a couple more binder events" into mainDaniele Di Proietto
2023-09-26Use ro.vndk.version to check if VNDK is deprecatedKiyoung Kim
ro.vndk.version will not be set if VNDK is deprecated. This change reads ro.vndk.version instead of temp property to check if the device is VNDK deprecated. Bug: 290159430 Test: Cuttlefish build and run succeeded Change-Id: I7ef2341872fb8dcd1a2ca5e0c853ada06d6726ac
2023-09-25[automerger skipped] Merge "[RESTRICT AUTOMERGE] SF: Call clear() instead of ↵Ryan Prichard
empty()" into main am: ded71e6876 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2756873 Change-Id: Idbbe6dfdeb52728f50f9f566a1e01cb0a30dee18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] [RESTRICT AUTOMERGE] SF: Call clear() instead of ↵Ryan Prichard
empty() am: f168dcdd73 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2756873 Change-Id: I455fb79fbd9e913d617136e92e72db0119a4d3c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Merge "Add CoGS team as OWNERS of ftl" into main am: b360539ad2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2762145 Change-Id: Ica2eb723f5477eabe739cb6c8241b77469b93a16 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Merge "[RESTRICT AUTOMERGE] SF: Call clear() instead of empty()" into mainRyan Prichard
2023-09-25Merge "Add CoGS team as OWNERS of ftl" into mainTreehugger Robot
2023-09-25Merge "Add jreck to SF owners" into main am: 9a14813c0bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2762125 Change-Id: Ib9ba37e87b5d7507ef93dc9c27eaaa6673bc1f0c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Merge "Add CoGS team as OWNERS of ftl" into main am: 41ccc209adTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2762105 Change-Id: I519b57254daf76a13aa2c857497e7956cec29196 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Add CoGS team as OWNERS of ftlDominik Laskowski
Change-Id: I3a0c6b46197debe5985d386b56bb1178e24d85f9
2023-09-25Merge "Add jreck to SF owners" into mainTreehugger Robot
2023-09-25Merge "Add CoGS team as OWNERS of ftl" into mainTreehugger Robot
2023-09-25Add jreck to SF ownersAdy Abraham
Change-Id: I73bcf6c5a0733993fdd0a24826e2936cb6f7c33c
2023-09-25Add CoGS team as OWNERS of ftlAdy Abraham
Change-Id: I6dedab758f2a6b50e07f2c9bf5fed8fcc37a8d52
2023-09-25tracing: Allow access to a couple more binder eventsDaniele Di Proietto
Bug: 295124679 Change-Id: I6a03e56d992c6d0d4e5e8137ceebe93e312e0640
2023-09-22Merge "Add libbinder_ndk_unit_test_host" into main am: e0e8b13d21Jooyung Han
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2758945 Change-Id: I2812c295e7ffe6606cee0d90c6806d9aff3f8dad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22Merge "binder_status.h: include assert.h for __assert" into main am: 7903adc970Ryan Prichard
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2758336 Change-Id: Ie4182d63212cfbdbda20f9c4a4cdaae126fdf5a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22Merge "binder: add missing <functional> include" into main am: 41790fcd7aRyan Prichard
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2758334 Change-Id: Ife7193dad99a68835c44309d1fa97aed062a7a56 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21[RESTRICT AUTOMERGE] SF: Call clear() instead of empty()Ryan Prichard
empty() returns bool and doesn't do anything. After upgrading libc++, discarding the result of empty() becomes an error because the function is marked with [[nodiscard]] in C++20 mode. Bug: 175635923 Test: treehugger Change-Id: I0dddc668fee3637a5e7c88925c522f04539abeba
2023-09-22Merge "Add libbinder_ndk_unit_test_host" into mainJooyung Han
2023-09-22Merge "binder_status.h: include assert.h for __assert" into mainRyan Prichard
2023-09-22Merge "binder: add missing <functional> include" into mainRyan Prichard
2023-09-21Merge "cputimeinstate: add missing <functional> include" into main am: ↵Ryan Prichard
9f2a647a7b Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2758335 Change-Id: If02f506cf235c4d98c8ccd6182c2963aaf05536e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 22:13:18 +0000