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

86973 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sophia Coldren
6221f6ed75 Merge "Add an include" into main am: d32b562ee9 am: b9a6391c7a am: b8b6762c0f am: c975c6ef4d am: 4111484a92 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2776100

Change-Id: I366cccdc8e54130db1d9bbde2957956b631bbf02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 00:48:01 +00:00
Xin Li
91197aea77 [automerger skipped] Merge "Merge Android 14" into main am: 37e9952c93 -s ours am: 529581ffa6 -s ours am: 64b2a1f453 -s ours am: 2c913b7ea5 -s ours am: 58cf328588 -s ours 
am skip reason: Merged-In Id86bcb915c8e2857bda26f64738dd5b643048e98 with SHA-1 1a3456f0bc is already in history

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

Change-Id: I7787d6eb3f7f2ea3c00adc95d0e78bbd1c4c5de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 00:25:08 +00:00
Xin Li
aafbdb831b [automerger skipped] Merge Android 14 am: 4f9ed9366f -s ours am: 51b9bb02a9 -s ours am: 91cb0e12c8 -s ours am: 9afe9094df -s ours am: 4c660a5ac2 -s ours 
am skip reason: Merged-In Id86bcb915c8e2857bda26f64738dd5b643048e98 with SHA-1 1a3456f0bc is already in history

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

Change-Id: I02186a8a6c8a3cfaaf563204c01523c52e629a74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 00:20:03 +00:00
Sophia Coldren
4111484a92 Merge "Add an include" into main am: d32b562ee9 am: b9a6391c7a am: b8b6762c0f am: c975c6ef4d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2776100

Change-Id: I3119b1ae954079ee6af7721da73cbd88f048a42d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 23:27:57 +00:00
Sophia Coldren
c975c6ef4d Merge "Add an include" into main am: d32b562ee9 am: b9a6391c7a am: b8b6762c0f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2776100

Change-Id: I14845b88353700ef0319bc14af941beb5bf8fc0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 22:55:42 +00:00
Sophia Coldren
b8b6762c0f Merge "Add an include" into main am: d32b562ee9 am: b9a6391c7a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2776100

Change-Id: Idc07d918374285c734ccef6bdffe8e4ed9134998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 22:20:18 +00:00
Sophia Coldren
b9a6391c7a Merge "Add an include" into main am: d32b562ee9 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2776100

Change-Id: Id824d2f119e5db34ce96a32ea2d387da62833e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 21:43:35 +00:00
Sophia Coldren
d32b562ee9 Merge "Add an include" into main 2023-10-06 21:14:22 +00:00
Sophia Coldren
5880692ae2 Add an include 
Change-Id: I0a6c64d9f1ddd9211de994fd4c6c44d53499775f
 2023-10-06 18:46:17 +00:00
Xin Li
58cf328588 [automerger skipped] Merge "Merge Android 14" into main am: 37e9952c93 -s ours am: 529581ffa6 -s ours am: 64b2a1f453 -s ours am: 2c913b7ea5 -s ours 
am skip reason: Merged-In Id86bcb915c8e2857bda26f64738dd5b643048e98 with SHA-1 1a3456f0bc is already in history

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

Change-Id: Ia23f4639d9f9476f549b329c0959f8e6e9b6d91e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 11:05:41 +00:00
Xin Li
4c660a5ac2 [automerger skipped] Merge Android 14 am: 4f9ed9366f -s ours am: 51b9bb02a9 -s ours am: 91cb0e12c8 -s ours am: 9afe9094df -s ours 
am skip reason: Merged-In Id86bcb915c8e2857bda26f64738dd5b643048e98 with SHA-1 1a3456f0bc is already in history

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

Change-Id: I9b5e8dbd7eac2e69e467946b64bfb1342e5fb09d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 11:00:33 +00:00
Xin Li
2c913b7ea5 [automerger skipped] Merge "Merge Android 14" into main am: 37e9952c93 -s ours am: 529581ffa6 -s ours am: 64b2a1f453 -s ours 
am skip reason: Merged-In Id86bcb915c8e2857bda26f64738dd5b643048e98 with SHA-1 1a3456f0bc is already in history

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

Change-Id: I45366e1481ca50f009518e0874befc83655c23b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:55:48 +00:00
Xin Li
9afe9094df [automerger skipped] Merge Android 14 am: 4f9ed9366f -s ours am: 51b9bb02a9 -s ours am: 91cb0e12c8 -s ours 
am skip reason: Merged-In Id86bcb915c8e2857bda26f64738dd5b643048e98 with SHA-1 1a3456f0bc is already in history

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

Change-Id: I7f0b3cb23ae139802066835a2134dc670ec91b27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:50:42 +00:00
Xin Li
64b2a1f453 [automerger skipped] Merge "Merge Android 14" into main am: 37e9952c93 -s ours am: 529581ffa6 -s ours 
am skip reason: Merged-In Id86bcb915c8e2857bda26f64738dd5b643048e98 with SHA-1 1a3456f0bc is already in history

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

Change-Id: Ifd591680244b71f7eb7d558f0454a291f82a1602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:04:11 +00:00
Xin Li
91cb0e12c8 [automerger skipped] Merge Android 14 am: 4f9ed9366f -s ours am: 51b9bb02a9 -s ours 
am skip reason: Merged-In Id86bcb915c8e2857bda26f64738dd5b643048e98 with SHA-1 1a3456f0bc is already in history

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

Change-Id: I22aef33ae94e8a3010a396e20adca89c2549ae84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 08:59:08 +00:00
Xin Li
529581ffa6 [automerger skipped] Merge "Merge Android 14" into main am: 37e9952c93 -s ours 
am skip reason: Merged-In Id86bcb915c8e2857bda26f64738dd5b643048e98 with SHA-1 1a3456f0bc is already in history

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

Change-Id: I85f48c46e37a0fcd18061bec7c7208a1248122fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 07:57:09 +00:00
Xin Li
51b9bb02a9 [automerger skipped] Merge Android 14 am: 4f9ed9366f -s ours 
am skip reason: Merged-In Id86bcb915c8e2857bda26f64738dd5b643048e98 with SHA-1 1a3456f0bc is already in history

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

Change-Id: Id85252ed6cede61a1e889f460c9d13b713c1fa0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 07:52:02 +00:00
Xin Li
37e9952c93 Merge "Merge Android 14" into main 2023-10-06 05:34:13 +00:00
Daniel Zheng
4537abda7e Merge "Removing is_retrofit code path" into main am: ad1ee13cec am: 2d7242c30b am: 94483ea63a am: 295b6833b0 am: 13113929d4 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762272

Change-Id: Ic6c55e6a4487486b0b9b81089616c96d60e8e76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 23:59:13 +00:00
Daniel Zheng
13113929d4 Merge "Removing is_retrofit code path" into main am: ad1ee13cec am: 2d7242c30b am: 94483ea63a am: 295b6833b0 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762272

Change-Id: I42c2f41ae9ef1514c76230e311dc2ed9dc5bdefd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 23:24:35 +00:00
Xin Li
4f9ed9366f Merge Android 14 
Bug: 298295554
Merged-In: Id86bcb915c8e2857bda26f64738dd5b643048e98
Change-Id: I6315e675753ec07fa1f67b69bcd05b831eeae6f0
 2023-10-05 15:45:15 -07:00
Daniel Zheng
295b6833b0 Merge "Removing is_retrofit code path" into main am: ad1ee13cec am: 2d7242c30b am: 94483ea63a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762272

Change-Id: I75a689dd4a1cb4922e2130ab036331e8e11cc80c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 22:36:01 +00:00
Daniel Zheng
88bd554fea Merge "Refactor off V2 Cow Ops" into main am: adad3dbefe am: 7248d1b0d8 am: 99ac415bff am: aba309904a am: b375e2381e 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2736101

Change-Id: I1c84b01b511e8587d571244ca805ba6ca7852348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 22:35:16 +00:00
Daniel Zheng
94483ea63a Merge "Removing is_retrofit code path" into main am: ad1ee13cec am: 2d7242c30b 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762272

Change-Id: I1d9326aaae92373c1e93ee1e940dc8f620590ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 22:04:44 +00:00
Daniel Zheng
b375e2381e Merge "Refactor off V2 Cow Ops" into main am: adad3dbefe am: 7248d1b0d8 am: 99ac415bff am: aba309904a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2736101

Change-Id: I50bcebebc2ba3528f3c8a1ebbdef0deef5490881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 22:02:32 +00:00
Daniel Zheng
2d7242c30b Merge "Removing is_retrofit code path" into main am: ad1ee13cec 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762272

Change-Id: Ib8555fb116e9fa470544b9ee50865267a2d56e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 21:30:53 +00:00
Daniel Zheng
aba309904a Merge "Refactor off V2 Cow Ops" into main am: adad3dbefe am: 7248d1b0d8 am: 99ac415bff 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2736101

Change-Id: Ie6ba8c6f05bdaed1daabbfbd8df1a905f5e64e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 21:13:00 +00:00
Daniel Zheng
ad1ee13cec Merge "Removing is_retrofit code path" into main 2023-10-05 20:58:50 +00:00
Daniel Zheng
99ac415bff Merge "Refactor off V2 Cow Ops" into main am: adad3dbefe am: 7248d1b0d8 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2736101

Change-Id: Idc51fa19054e58f9e6ca482b42b97ab6e95f1914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 20:41:32 +00:00
Arun Sharma
4618e3413b Merge "FastbootDevice::boot1_1 null pointer dereference" into main am: 608e33f736 am: 828d85ae89 am: 932fe519f6 am: 4a2611cc5b am: 3da4ed0062 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2768099

Change-Id: I90eb1a0507b80f04bae77c858617df1e40921006
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 19:54:07 +00:00
Daniel Zheng
39336e6b0b Merge "Adding test for reader compatibility" into main am: 4b3b6e2ff5 am: 4cda9ec9bb am: 5c3edb098a am: c7a74d64f8 am: 5a528ef7a7 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762279

Change-Id: I1d14a41f78b8f853f99261ead4a3171864b62115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 19:53:27 +00:00
Daniel Zheng
7248d1b0d8 Merge "Refactor off V2 Cow Ops" into main am: adad3dbefe 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2736101

Change-Id: I0344daaa43ed555c0bcdd377629c70a167f2afa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 19:39:28 +00:00
Daniel Zheng
3e9b88d504 Removing is_retrofit code path 
This code path was never invoked. is_logical will return false on
secondary partitions in retrofit devices, so nothing actually is ever
deleted. If we manage to call the delete, the device side code will
fail with "cannot open the super partition"

Test: fastboot flashall on sargo device
Change-Id: I20b430c5c30bf992506190ea4e00b0b69c7b1005
 2023-10-05 12:37:57 -07:00
Arun Sharma
3da4ed0062 Merge "FastbootDevice::boot1_1 null pointer dereference" into main am: 608e33f736 am: 828d85ae89 am: 932fe519f6 am: 4a2611cc5b 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2768099

Change-Id: Ie00d5b40094c920bffd548284308bb21e8c0616c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 19:23:26 +00:00
Daniel Zheng
5a528ef7a7 Merge "Adding test for reader compatibility" into main am: 4b3b6e2ff5 am: 4cda9ec9bb am: 5c3edb098a am: c7a74d64f8 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762279

Change-Id: Icd800cf062584c82d745ea5adea9215f451b8d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 19:23:02 +00:00
Daniel Zheng
adad3dbefe Merge "Refactor off V2 Cow Ops" into main 2023-10-05 19:12:56 +00:00
Arun Sharma
4a2611cc5b Merge "FastbootDevice::boot1_1 null pointer dereference" into main am: 608e33f736 am: 828d85ae89 am: 932fe519f6 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2768099

Change-Id: Ic2cecbd2bb771b682bb6f97e596a0759f804a774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 18:47:24 +00:00
Daniel Zheng
c7a74d64f8 Merge "Adding test for reader compatibility" into main am: 4b3b6e2ff5 am: 4cda9ec9bb am: 5c3edb098a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762279

Change-Id: If7d7ab0fee4b07385692408570b4368549eefe50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 18:47:15 +00:00
Elliott Hughes
aef90ea853 Merge "s/master/main/" into main am: b533f531df am: 5cc875126a am: 061a92c8ae am: fc090e5055 am: 01a560055c 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2772867

Change-Id: I4db6a0255b074444014e4116961e3b4df40c1dbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 18:46:11 +00:00
Arun Sharma
932fe519f6 Merge "FastbootDevice::boot1_1 null pointer dereference" into main am: 608e33f736 am: 828d85ae89 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2768099

Change-Id: I205dca350682e9ae709838db645c229c978ebb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 18:16:09 +00:00
Daniel Zheng
5c3edb098a Merge "Adding test for reader compatibility" into main am: 4b3b6e2ff5 am: 4cda9ec9bb 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762279

Change-Id: I822ce478a5345a5c9050e9ee5fcc1aec7026aaa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 18:15:41 +00:00
Elliott Hughes
01a560055c Merge "s/master/main/" into main am: b533f531df am: 5cc875126a am: 061a92c8ae am: fc090e5055 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2772867

Change-Id: Ia928aae9661fb22e9b1cbc5d3269ce46be49f895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 18:15:40 +00:00
Arun Sharma
828d85ae89 Merge "FastbootDevice::boot1_1 null pointer dereference" into main am: 608e33f736 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2768099

Change-Id: Id99a4a6aceaedfdbc67311d6f7234c3334fc0209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 17:45:17 +00:00
Daniel Zheng
4cda9ec9bb Merge "Adding test for reader compatibility" into main am: 4b3b6e2ff5 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762279

Change-Id: I3720f7f966c54408c1c4dbe72222dac73ef6dbae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 17:45:07 +00:00
Elliott Hughes
fc090e5055 Merge "s/master/main/" into main am: b533f531df am: 5cc875126a am: 061a92c8ae 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2772867

Change-Id: I94daab076794fc8d3bf5b1813c8b29f529f690e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 17:42:29 +00:00
Arun Sharma
608e33f736 Merge "FastbootDevice::boot1_1 null pointer dereference" into main 2023-10-05 17:33:34 +00:00
Elliott Hughes
061a92c8ae Merge "s/master/main/" into main am: b533f531df am: 5cc875126a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2772867

Change-Id: I16d0bb81dd3f3979528614bcec1bf952cacab784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 17:12:02 +00:00
Akilesh Kailash
3c12740dde Merge "snapuserd: I/O request on overlapping blocks during snapshot-merge." into main am: 743c4cdb1c am: 0d38654b34 am: 614a4d4268 am: d399f0820a am: bfe8f13f17 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2769106

Change-Id: Ib239f28b88bf8494cd9c5a947f3c6541192e6d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 17:11:59 +00:00
Daniel Zheng
4b3b6e2ff5 Merge "Adding test for reader compatibility" into main 2023-10-05 17:04:17 +00:00
Elliott Hughes
5cc875126a Merge "s/master/main/" into main am: b533f531df 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2772867

Change-Id: Ide151a5572106cb6e071ecdb70d97968d2a4a8a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 16:41:39 +00:00