ScoopDroid/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
91433 commits 3 branches 0 tags 217 MiB
Commit graph

91433 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Anderson
cd043efa5c [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 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: I815ba7dbd6947e0028142fe2c5c84c347d28ae72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 02:40:05 +00:00
David Anderson
92b764299f [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 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: I722a97054fcaca8dfa5f97872bb783510a5949e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 02:40:01 +00:00
David Anderson
245c4ba913 [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: Ib131fb47fc696776b9f4d629196d4333b479cb25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 02:39:40 +00:00
David Anderson
f99378f631 [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: Ib3b5be850dacb99ee00898f06ed8376d2345c9bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 02:39:36 +00:00
Android Build Coastguard Worker
6d96be9dc8 Snap for 12664851 from 94560a2cfa to 25Q1-release 
Change-Id: I3745b6ecc7675324a2a049881cc85e103dd61dad
 2024-11-16 02:20:09 +00:00
David Anderson
1c2e80af4e [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 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: I2655f0e817a766a34ebcf08911666392e8e232ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 01:55:09 +00:00
David Anderson
d2f8076ec9 [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 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: I93f2116cc7f38b9b10a229dc628a7b17f2076fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 01:55:08 +00:00
David Anderson
1d619599ff [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 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: If447bfa5e46040d7a7140cadddf5e789eb59cd06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 01:55:05 +00:00
David Anderson
b6b015fd81 [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 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: I95577bb4084f62c48d252030b15b1f11945d530f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 01:55:05 +00:00
David Anderson
ffded00943 [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 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: I7ac6510c48e222f2c9962e99b06f23733644a20e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 01:54:54 +00:00
David Anderson
7327a1f49e [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: 8e1fdcc8ce -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: I47db4ae7781b03fa3adba4ea621389a60175f6fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 01:54:53 +00:00
David Anderson
a33c4c9fec [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 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: I59b7eec1a7233139cbc8d13b2068d3d658e1aa34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 01:54:51 +00:00
David Anderson
2c9ab3a120 [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: 6274a0c950 -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: Ib26844c17e6addd07bae55e3b6668a7ee81656b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 01:54:49 +00:00
David Anderson
65cbd7ca39 [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: 0e03e6be62 -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: I3ea530edbfa85b47d273d5e09f4eedd0d4acc511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-11-16 01:54:36 +00:00