ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
91447 commits 1 branch 0 tags 217 MiB
Commit graph

91447 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maciej Żenczykowski
fdaaef9523 Revert "libprocessgroup: Remove __BEGIN_DECLS and __END_DECLS" 
This reverts commit fdf4432356.

Reason for revert: b/379796721

Change-Id: I34cdc69d5b8d11446da02106b7bd593a8c8151c3
 2024-11-19 19:24:54 +00:00
Akilesh Kailash
6028880ac0 Move snapuserd_test to postsubmit 
Bug: 338329603
Test: Build
Change-Id: Ibee6be732078ea7e11fe7348772837b9b2699fbf
Signed-off-by: Akilesh Kailash <akailash@google.com>
 2024-11-19 10:27:20 -08:00
David Anderson
44461354fd snapuserd: Use GTEST_SKIP in snapuserd_test. 
The test harness treats an early exit as a failure, so use GTEST_SKIP()
instead.

Bug: 379242140
Test: vts_snapuserd_test
Change-Id: I25351bb7ebf65e6c56865662d297feb4a1f635b3
(cherry picked from commit 668ffc395d)
 2024-11-19 17:34:44 +00:00
Eric Caruso
d17d5c585e ueventd: add support for driver section in ueventd.rc 
Allow ueventd configuration to specify what to do with
devices based on driver. This responds to bind events and
treats them similarly to add events.

The format of the driver stanza is exactly the same as
that of the subsystem stanza.

Bug: 376900376
Test: set up cbc_mbim driver stanza and ensure it properly
  creates and destroys device nodes when a USB device with
  that driver appears and disappears or is bound and unbound

Change-Id: I31f5c91bd074d14075b74fe7beefaa6ac07a7ac9
 2024-11-19 12:07:30 -05:00
Treehugger Robot
33be42e92c Merge "snapuserd: Use GTEST_SKIP in snapuserd_test." into main am: a7ce1a5975 am: 6e61d69779 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3363449

Change-Id: I70a27a736e4d35d15e8fe4de6a9ddbb9881766b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-19 05:50:03 +00:00
Treehugger Robot
6e61d69779 Merge "snapuserd: Use GTEST_SKIP in snapuserd_test." into main am: a7ce1a5975 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3363449

Change-Id: I7c269dfac4307039e51ecb59280dc6d8616d80e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-19 05:28:32 +00:00
Treehugger Robot
a7ce1a5975 Merge "snapuserd: Use GTEST_SKIP in snapuserd_test." into main 2024-11-19 05:01:23 +00:00
David Anderson
668ffc395d snapuserd: Use GTEST_SKIP in snapuserd_test. 
The test harness treats an early exit as a failure, so use GTEST_SKIP()
instead.

Bug: 379242140
Test: vts_snapuserd_test
Change-Id: I25351bb7ebf65e6c56865662d297feb4a1f635b3
 2024-11-18 19:24:29 -08:00
Neill Kapron
f1d00f0f2a libcutils: create rust bindings for android ids 
For work on the new rust based bpfloader, we need access to the IDs in
android_filesystem_config.h for owner/group permissions of pinned bpf
programs and maps. Create android_ids crate to expose this
information to rust.

Bug: 359646531
Test: Manual
Change-Id: Iee827d8a80a82fbee02a76280668071713625abf
Signed-off-by: Neill Kapron <nkapron@google.com>
 2024-11-19 02:47:16 +00:00
Android Build Coastguard Worker
f02711f9b9 Snap for 12673321 from 62d380068f to 25Q1-release 
Change-Id: I120422907073d672b556f7fb95b4f371effa5bb6
 2024-11-19 00:24:00 +00:00
Christopher Ferris
a325412703 Merge "Remove non-UTF8 characters from string fields." into main am: d7f95d9e69 am: aa62183b7c 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3353805

Change-Id: I352686af7a34965c0c1d98ef41b6d9e7d6ac0cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-18 22:09:21 +00:00
Christopher Ferris
aa62183b7c Merge "Remove non-UTF8 characters from string fields." into main am: d7f95d9e69 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3353805

Change-Id: I9c8384a41928e1c4021b26638c3de2bf1a74fa6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-18 21:46:30 +00:00
Treehugger Robot
7f1d0b2fa6 Merge "Fix typo of snapuserd_verify.h" into main am: a747b7560a am: ab934a214e 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3359022

Change-Id: I31b584d1a7469eda7225e03ec253858f80672d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-18 21:34:57 +00:00
Christopher Ferris
d7f95d9e69 Merge "Remove non-UTF8 characters from string fields." into main 2024-11-18 21:26:08 +00:00
Treehugger Robot
ab934a214e Merge "Fix typo of snapuserd_verify.h" into main am: a747b7560a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3359022

Change-Id: I8b1bcf3e531916a05642adac93cfe8ce76380a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-18 20:59:08 +00:00
Treehugger Robot
62d380068f Merge changes Iae1cbfcc,I4466838c,I19c75e50,I2f49fab1 into main am: 569db94fa8 am: 2a0958b18f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3353381

Change-Id: I6c331cc91fa2b5ce125f64a37a6d390f7684b335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-18 20:35:37 +00:00
Treehugger Robot
a747b7560a Merge "Fix typo of snapuserd_verify.h" into main 2024-11-18 20:35:08 +00:00
Gabriel Biren
6105d9dc8a Create the mainline supplicant directory 
during initialization.

Bug: 365585450
Test: Manual test - verify that the mainline
      supplicant can add/remove interfaces
Change-Id: Ib41b361a8b032c04586f108be9d1933214934286
 2024-11-18 20:24:58 +00:00
Treehugger Robot
2a0958b18f Merge changes Iae1cbfcc,I4466838c,I19c75e50,I2f49fab1 into main am: 569db94fa8 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3353381

Change-Id: Ia0efeea6fff783b444be1396ca275352d88a5d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-18 20:12:45 +00:00
Hung Nguyen
3d6f07499e Merge "Add AID for memory management daemon" into main am: a0627e76ab am: 884efb9278 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3344544

Change-Id: I92c15012bc0a397bcb66fb1819e5c5a4ed6e287c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-18 20:12:43 +00:00
Hung Nguyen
884efb9278 Merge "Add AID for memory management daemon" into main am: a0627e76ab 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3344544

Change-Id: I7334658d31b402a61e97b35c5238d3f70c19c9d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-18 20:11:43 +00:00
Treehugger Robot
569db94fa8 Merge changes Iae1cbfcc,I4466838c,I19c75e50,I2f49fab1 into main 
* changes:
  libprocessgroup: Remove __BEGIN_DECLS and __END_DECLS
  libprocessgroup: Convert CGROUPV2_HIERARCHY_NAME to std::string
  libprocessgroup: Remove CGROUPV2_CONTROLLER_NAME
  libprocessgroup: Remove CGROUPS_RC_PATH
 2024-11-18 19:57:51 +00:00
Hung Nguyen
a0627e76ab Merge "Add AID for memory management daemon" into main 2024-11-18 19:41:24 +00:00
Aeric
28b2556e90 Fix typo of snapuserd_verify.h 
"advisible" should be "advisable"
"fucntionality" should be "functionality"

Bug: 379603290
Test: build pass
Change-Id: I6c95f2b186f479ba51df8603ce87c0522e91bf64
 2024-11-18 17:32:55 +08:00
Android Build Coastguard Worker
7e306c5146 Snap for 12667701 from 51ce4016ca to 25Q1-release 
Change-Id: I715f5c4701a4382e36bd850b4860a3f7211be100
 2024-11-16 23:09:15 +00:00
Chan Wang
51ce4016ca Merge "Use the new 'partition' field in 'ApexInfo' to identify vendor apexes" into main am: c759f23f2f am: d65d54a577 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3351258

Change-Id: Ibdadf359a912d5893b4d480f0202a7021bd5f8c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 12:27:27 +00:00
Chan Wang
d65d54a577 Merge "Use the new 'partition' field in 'ApexInfo' to identify vendor apexes" into main am: c759f23f2f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3351258

Change-Id: I6dbd2b808549375c2916b41bd38e198a73c1260c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 12:05:50 +00:00
Chan Wang
c759f23f2f Merge "Use the new 'partition' field in 'ApexInfo' to identify vendor apexes" into main 2024-11-16 11:41:00 +00:00
David Anderson
b993845f44 [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-v2-dev am: 67ad3ba97e -s ours am: ea64e19a61 -s ours am: ebf0697a21 -s ours am: 089835a5a5 -s ours am: cd043efa5c -s ours am: 3dbfb3f25e -s ours am: 92d9026d02 -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: I97c0f31e77f871dcdcd2d05393213510fb6fd8c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 03:28:40 +00:00
David Anderson
07a2b20e57 [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: e68f6cd6c0 -s ours am: 2b61791b2b -s ours am: 2de48667d2 -s ours am: 2e9954dd6b -s ours am: 92b764299f -s ours am: 70f8484a23 -s ours am: 00575e2a73 -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: Icd9aa448b448925d91a9b081e21733a7a7997897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 03:28:37 +00:00
David Anderson
fc89134e13 [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-v2-dev am: 67ad3ba97e -s ours am: ea64e19a61 -s ours am: fb14c7ed45 -s ours am: 1c2e80af4e -s ours am: 245c4ba913 -s ours am: 0bd800e43e -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: I52b8bb787f6d514c92cc502fd5133aed6c1d3dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 03:28:25 +00:00
David Anderson
458b6ea8b3 [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: e68f6cd6c0 -s ours am: 2b61791b2b -s ours am: 03470e533a -s ours am: b6b015fd81 -s ours am: f99378f631 -s ours am: f76cb2b692 -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: I31d0017da7adb6ce2c0d685fa0985e5628a24a3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 03:28:22 +00:00
David Anderson
92d9026d02 [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-v2-dev am: 67ad3ba97e -s ours am: ea64e19a61 -s ours am: ebf0697a21 -s ours am: 089835a5a5 -s ours am: cd043efa5c -s ours am: 3dbfb3f25e -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: Ifb754a1800d4bc855ee12f854f0bd29b037e0209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 03:05:11 +00:00
David Anderson
00575e2a73 [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: e68f6cd6c0 -s ours am: 2b61791b2b -s ours am: 2de48667d2 -s ours am: 2e9954dd6b -s ours am: 92b764299f -s ours am: 70f8484a23 -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: If347296b701a1db5ee4b8d2fa5267da34a8bd5df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 03:05:09 +00:00
David Anderson
0bd800e43e [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-v2-dev am: 67ad3ba97e -s ours am: ea64e19a61 -s ours am: fb14c7ed45 -s ours am: 1c2e80af4e -s ours am: 245c4ba913 -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: Ie6781793e855fbacc6aa5c6333a896c314d9f5cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 03:05:00 +00:00
David Anderson
3473e74332 [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-v2-dev am: 67ad3ba97e -s ours am: ea64e19a61 -s ours am: ebf0697a21 -s ours am: 089835a5a5 -s ours am: cd043efa5c -s ours am: a322cba1fd -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: Iece947ef6b4d35b7e056793bd020bc5cfe618c4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 03:05:00 +00:00
David Anderson
f76cb2b692 [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: e68f6cd6c0 -s ours am: 2b61791b2b -s ours am: 03470e533a -s ours am: b6b015fd81 -s ours am: f99378f631 -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: I0a24c424125bdf5f8901557be66c6151c32db059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 03:04:58 +00:00
David Anderson
99198222ad [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: e68f6cd6c0 -s ours am: 2b61791b2b -s ours am: 2de48667d2 -s ours am: 2e9954dd6b -s ours am: 92b764299f -s ours am: 872179b222 -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: Iafc46a6d6169d40a5596aa766af7da0598adaeea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 03:04:57 +00:00
David Anderson
cab03c6095 [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-v2-dev am: 67ad3ba97e -s ours am: ea64e19a61 -s ours am: fb14c7ed45 -s ours am: 1c2e80af4e -s ours am: c653a7379d -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: I5ed8f92d6c7975bdb4dfae7346b4d6cbd6d4ae4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 03:04:44 +00:00
David Anderson
e4eb50eded [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: e68f6cd6c0 -s ours am: 2b61791b2b -s ours am: 03470e533a -s ours am: b6b015fd81 -s ours am: f369148f70 -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: I468fe9a9c7a868b5928f385d81e0f80023eb040c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 03:04:40 +00:00
David Anderson
3dbfb3f25e [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-v2-dev am: 67ad3ba97e -s ours am: ea64e19a61 -s ours am: ebf0697a21 -s ours am: 089835a5a5 -s ours am: cd043efa5c -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: I178e580552b0c01bcda04f92aba5c519e87b08f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 02:51:54 +00:00
David Anderson
70f8484a23 [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: e68f6cd6c0 -s ours am: 2b61791b2b -s ours am: 2de48667d2 -s ours am: 2e9954dd6b -s ours am: 92b764299f -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: I79575bf3bb6eda4e16a4dfb6fa3ba2f1264eb858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 02:51:50 +00:00
David Anderson
ee86cb64c8 [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-qpr1-dev am: 3b92281e2f -s ours am: 6fe136b92b -s ours am: 186d0d0fec -s ours am: 7b26493216 -s ours am: 4160bc71bf -s ours am: f4829170c0 -s ours am: be4751c3d1 -s ours am: d2f8076ec9 -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c434d801d6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30087167

Change-Id: I5a54fbd8f21a3e93427e026637a6a0cfcf5a55a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 02:41:43 +00:00
David Anderson
76f0cf0708 [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: c9e000c7ac -s ours am: e1c43c911e -s ours am: 417dcb2186 -s ours am: c7e49a0640 -s ours am: f0a6fde1fb -s ours am: 6652474a8b -s ours am: 52036fc28a -s ours am: 1d619599ff -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c434d801d6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30087167

Change-Id: I854d70145344aa7e965e817c070a69373514d37d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 02:41:41 +00:00
David Anderson
6f975a0278 [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-qpr1-dev am: 3b92281e2f -s ours am: 6fe136b92b -s ours am: 186d0d0fec -s ours am: 342a9edfa9 -s ours am: b517729170 -s ours am: e74af9298c -s ours am: ffded00943 -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c434d801d6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30087167

Change-Id: I982c526ff4d2549fbd4acb738db4322ac2fd66dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 02:41:29 +00:00
David Anderson
6130f80153 [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: c9e000c7ac -s ours am: e1c43c911e -s ours am: 417dcb2186 -s ours am: c4124697c8 -s ours am: 2d7dcaa529 -s ours am: 48fd54d6e3 -s ours am: a33c4c9fec -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c434d801d6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30087167

Change-Id: I661e0073c0f7d4badb3f4707502040e5dbf5065b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 02:41:26 +00:00
David Anderson
a322cba1fd [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-v2-dev am: 67ad3ba97e -s ours am: ea64e19a61 -s ours am: ebf0697a21 -s ours am: 089835a5a5 -s ours am: cd043efa5c -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: I7fc88156956214a45f8e1ecf3e6f4a35b83436b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 02:41:24 +00:00
David Anderson
872179b222 [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: e68f6cd6c0 -s ours am: 2b61791b2b -s ours am: 2de48667d2 -s ours am: 2e9954dd6b -s ours am: 92b764299f -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: If07db1e020390e1314c188d8541d3cbd7dfe188b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 02:41:22 +00:00
David Anderson
c653a7379d [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-v2-dev am: 67ad3ba97e -s ours am: ea64e19a61 -s ours am: fb14c7ed45 -s ours am: 1c2e80af4e -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: If38056998e4996edcecd8a9b791bb17e120e42e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 02:41:14 +00:00
David Anderson
f369148f70 [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: e68f6cd6c0 -s ours am: 2b61791b2b -s ours am: 03470e533a -s ours am: b6b015fd81 -s ours 
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: I729736d79d9e62d7974ededfb6707ea7ff9dc46f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 02:41:12 +00:00