Commit graph

86720 commits

Author SHA1 Message Date
Treehugger Robot
c5851eded9 Merge "Don't duplicate uapi ioprio constants." into main am: 46c366b0ed am: de1aeee88d am: ab62e7d3b0 am: f2c81fdd01 am: 239978de62
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759694

Change-Id: I7f6efb219fa48302f3d759cf686a5a696210b78a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 22:44:39 +00:00
Treehugger Robot
d4eca869d6 Merge "Remove redefinition of uapi constant added in R." into main am: d5b09b4b97 am: c3bbf8237a am: 7a1d3efb41 am: 5c30491a99 am: 73f83e22f9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2760268

Change-Id: I784e9d263d970a94f3305776bb9505aba7c4cab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 22:41:25 +00:00
Treehugger Robot
239978de62 Merge "Don't duplicate uapi ioprio constants." into main am: 46c366b0ed am: de1aeee88d am: ab62e7d3b0 am: f2c81fdd01
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759694

Change-Id: I0bd99fffe60f7576fc4342118f9b13290fa91cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 21:36:58 +00:00
Treehugger Robot
73f83e22f9 Merge "Remove redefinition of uapi constant added in R." into main am: d5b09b4b97 am: c3bbf8237a am: 7a1d3efb41 am: 5c30491a99
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2760268

Change-Id: I15045a282c82e4da21ac9387d0d1ea0f4fd5c5f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 21:36:13 +00:00
Treehugger Robot
f2c81fdd01 Merge "Don't duplicate uapi ioprio constants." into main am: 46c366b0ed am: de1aeee88d am: ab62e7d3b0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759694

Change-Id: If5ac3213e8b99a0141e023a30f27db89f623cb53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 20:56:43 +00:00
Treehugger Robot
5c30491a99 Merge "Remove redefinition of uapi constant added in R." into main am: d5b09b4b97 am: c3bbf8237a am: 7a1d3efb41
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2760268

Change-Id: I7fe53123b6360a7e9e82b8959ed69f87224dd04f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 20:54:32 +00:00
Treehugger Robot
ab62e7d3b0 Merge "Don't duplicate uapi ioprio constants." into main am: 46c366b0ed am: de1aeee88d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759694

Change-Id: I75c2bdd4423158ad9749212cf1fa35726ecd97c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 20:01:51 +00:00
Treehugger Robot
7a1d3efb41 Merge "Remove redefinition of uapi constant added in R." into main am: d5b09b4b97 am: c3bbf8237a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2760268

Change-Id: Icc73bfcb93772b2cdb3c247ff02987f123f99aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 20:01:41 +00:00
Treehugger Robot
de1aeee88d Merge "Don't duplicate uapi ioprio constants." into main am: 46c366b0ed
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759694

Change-Id: I6bfe444c1ed43240506d9031796bd1cf03a97ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 19:03:19 +00:00
Treehugger Robot
c3bbf8237a Merge "Remove redefinition of uapi constant added in R." into main am: d5b09b4b97
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2760268

Change-Id: I7301abb110d029f8bda465fe0fd569924f52b766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 19:02:32 +00:00
Treehugger Robot
46c366b0ed Merge "Don't duplicate uapi ioprio constants." into main 2023-09-22 18:00:19 +00:00
Treehugger Robot
d5b09b4b97 Merge "Remove redefinition of uapi constant added in R." into main 2023-09-22 17:58:03 +00:00
Elliott Hughes
3369fe9cbb Don't duplicate uapi ioprio constants.
This code is only used in init and vold, so I suspect all the
conditional compilation could be moved into the .bp file instead, but
I'm just trying to clean up duplication today...

Test: treehugger
Change-Id: I97013f5de41e109a0cc377400c396145aed569db
2023-09-22 14:51:26 +00:00
Elliott Hughes
1faedd02a3 Remove redefinition of uapi constant added in R.
Test: treehugger
Change-Id: If0ef9c36b2f54eb59d222dedc6bf575d46c9db1d
2023-09-22 14:45:20 +00:00
Treehugger Robot
b9f8824754 Merge "Delete unused DATA_MNT_POINT macro" into main am: 9c562cf82b am: 5e32ce2d28 am: afc3f8e7e4 am: 0fe1b3c518 am: fcee2ca617
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759565

Change-Id: If01bfb413445ff68ec624edd740f4a88b69d527c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 22:18:51 +00:00
Treehugger Robot
fcee2ca617 Merge "Delete unused DATA_MNT_POINT macro" into main am: 9c562cf82b am: 5e32ce2d28 am: afc3f8e7e4 am: 0fe1b3c518
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759565

Change-Id: Ic51ec3ef07d2e0914795f9e74d3149d791a067f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 21:15:33 +00:00
Treehugger Robot
0fe1b3c518 Merge "Delete unused DATA_MNT_POINT macro" into main am: 9c562cf82b am: 5e32ce2d28 am: afc3f8e7e4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759565

Change-Id: I92e8065d63da898e101772b7920125560b5dd2f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 20:33:46 +00:00
Treehugger Robot
afc3f8e7e4 Merge "Delete unused DATA_MNT_POINT macro" into main am: 9c562cf82b am: 5e32ce2d28
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759565

Change-Id: I74a7664e9ac5626e77324c4dec02367ef53999d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 19:37:48 +00:00
Treehugger Robot
5e32ce2d28 Merge "Delete unused DATA_MNT_POINT macro" into main am: 9c562cf82b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2759565

Change-Id: I8e9399915ad0b69618163a2d0d5a719e57700efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 18:39:58 +00:00
Treehugger Robot
9c562cf82b Merge "Delete unused DATA_MNT_POINT macro" into main 2023-09-21 17:33:28 +00:00
Andrew Scull
f06e218e82 Delete unused DATA_MNT_POINT macro
The macros isn't used anywhere but was a distraction when tracking down
/data mounting behaviour.

Test: build
Change-Id: Ie23574326cbebd7f515c8409e1dcb91a00cafc6f
2023-09-21 14:50:55 +00:00
Treehugger Robot
b56f6c6adc Merge "Remove unnecessary keyword setting" into main am: fad3b2fbad am: d9e8e5665a am: f78b38bb76 am: d53debca47 am: 046b52dd3c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2754910

Change-Id: If60325c15038898798795266a7133e562a8847d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 02:37:31 +00:00
Treehugger Robot
046b52dd3c Merge "Remove unnecessary keyword setting" into main am: fad3b2fbad am: d9e8e5665a am: f78b38bb76 am: d53debca47
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2754910

Change-Id: I91fc475a428dc1774cc42844167e771315192d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 01:31:24 +00:00
Treehugger Robot
d53debca47 Merge "Remove unnecessary keyword setting" into main am: fad3b2fbad am: d9e8e5665a am: f78b38bb76
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2754910

Change-Id: I220524b860c3039e6b2210c72a76ae9b1a05d1aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 00:50:55 +00:00
Dan Shi
ca737b4259 Merge "Move CF only tests to CF test mapping suite" into main am: 19224ed589 am: 1b51ffb4e4 am: 8534e84a3e am: 72993115f3 am: d2aa1ecf9c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2754947

Change-Id: I9bcf4feae9476be19540c585297bb16478057880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 00:50:32 +00:00
Treehugger Robot
f78b38bb76 Merge "Remove unnecessary keyword setting" into main am: fad3b2fbad am: d9e8e5665a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2754910

Change-Id: Idb4ff2819347b6671a209a367348099cca120490
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 23:57:20 +00:00
Dan Shi
d2aa1ecf9c Merge "Move CF only tests to CF test mapping suite" into main am: 19224ed589 am: 1b51ffb4e4 am: 8534e84a3e am: 72993115f3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2754947

Change-Id: I14b17d77b636fc8c2e16fe7389dd2e7b8349b12d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 23:44:05 +00:00
Dan Shi
72993115f3 Merge "Move CF only tests to CF test mapping suite" into main am: 19224ed589 am: 1b51ffb4e4 am: 8534e84a3e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2754947

Change-Id: Iaa11c50ab3b7f924d379d0257418c3bbc1d93bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 23:01:46 +00:00
Treehugger Robot
d9e8e5665a Merge "Remove unnecessary keyword setting" into main am: fad3b2fbad
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2754910

Change-Id: I4963f8ef1904fc487beddf65eb7d1b20965c6987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 22:57:16 +00:00
Treehugger Robot
fad3b2fbad Merge "Remove unnecessary keyword setting" into main 2023-09-20 22:25:07 +00:00
Dan Shi
8534e84a3e Merge "Move CF only tests to CF test mapping suite" into main am: 19224ed589 am: 1b51ffb4e4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2754947

Change-Id: Ief981cf9d0a064302883ea41109bc619e1442330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 22:09:24 +00:00
Dan Shi
1b51ffb4e4 Merge "Move CF only tests to CF test mapping suite" into main am: 19224ed589
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2754947

Change-Id: I8517d5ca5b4982a05681462d24933959057dd865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:12:30 +00:00
Dan Shi
43c87b3291 Remove unnecessary keyword setting
These 2 tests can run on aosp cf.

Bug: 300519349
Test: atest presubmit check
Change-Id: I8ee41c2abe464be2c2ee4537de5edf86308183aa
2023-09-20 13:26:18 -07:00
Tomasz Wasilczyk
1ef3ab6137 Merge "Don't depend on String8 cast to C string" into main am: 24636e4e30 am: ed26eba982 am: a025e97c60 am: dc038aa6b0 am: 16ff6995f3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2748674

Change-Id: I2f9ad6f295ccb64537715a644d1d717a06fad6e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 20:22:30 +00:00
Elliott Hughes
f5d2953bab Merge "arm64: update the "minimum maximum" comment." into main am: cc8d909ccb am: be175c3af6 am: 272351cefd am: af6f413068 am: d4b2240eca
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2755786

Change-Id: Ie3038bddb055f9ea05595c5732d1ac888060863d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 20:21:36 +00:00
Dan Shi
19224ed589 Merge "Move CF only tests to CF test mapping suite" into main 2023-09-20 20:20:35 +00:00
Tomasz Wasilczyk
16ff6995f3 Merge "Don't depend on String8 cast to C string" into main am: 24636e4e30 am: ed26eba982 am: a025e97c60 am: dc038aa6b0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2748674

Change-Id: Id5d7a51a5a7bd872b234f1eacb9a6b7ae72787e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 19:15:59 +00:00
Elliott Hughes
d4b2240eca Merge "arm64: update the "minimum maximum" comment." into main am: cc8d909ccb am: be175c3af6 am: 272351cefd am: af6f413068
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2755786

Change-Id: I03e98e18fac2f3f0dbe53604056c5b3247c241c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 19:15:13 +00:00
Tomasz Wasilczyk
dc038aa6b0 Merge "Don't depend on String8 cast to C string" into main am: 24636e4e30 am: ed26eba982 am: a025e97c60
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2748674

Change-Id: I01717267e12a6c875b3f2b5783e7bbd9b4c98ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 18:35:08 +00:00
Elliott Hughes
af6f413068 Merge "arm64: update the "minimum maximum" comment." into main am: cc8d909ccb am: be175c3af6 am: 272351cefd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2755786

Change-Id: Id485072b607cc3aaee0eb5aa0ac6cd2d0242f323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 18:34:15 +00:00
Dan Shi
a95ed0aeac Move CF only tests to CF test mapping suite
This change doesn't modify presubmit coverage, the tests will still
run in the lab as test mapping suite, just on a different ATP test
config that dedicated to tests can only run on CF (not aosp_cf), on
git_main branch.

Bug: 300519349
Test: atest presubmit check
Change-Id: Ib179c034dc58f8d8a763d374af0d103baf51343b
2023-09-20 18:27:43 +00:00
Tomasz Wasilczyk
a025e97c60 Merge "Don't depend on String8 cast to C string" into main am: 24636e4e30 am: ed26eba982
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2748674

Change-Id: I5afbaa0aa84a35f6125fe3c726a4fdab032fcf58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 17:43:07 +00:00
Elliott Hughes
272351cefd Merge "arm64: update the "minimum maximum" comment." into main am: cc8d909ccb am: be175c3af6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2755786

Change-Id: I2c40d6b2320a24b5bff37a98414b43006b6c12e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 17:42:29 +00:00
Tomasz Wasilczyk
ed26eba982 Merge "Don't depend on String8 cast to C string" into main am: 24636e4e30
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2748674

Change-Id: I71dd71eb6269f4be22488ab2b58e4cc5b47c8b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 17:37:43 +00:00
Tomasz Wasilczyk
24636e4e30 Merge "Don't depend on String8 cast to C string" into main 2023-09-20 17:02:45 +00:00
Elliott Hughes
be175c3af6 Merge "arm64: update the "minimum maximum" comment." into main am: cc8d909ccb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2755786

Change-Id: I70bf4e5a0fa4f1f4c969af72be36734f44163c2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 16:45:08 +00:00
Elliott Hughes
cc8d909ccb Merge "arm64: update the "minimum maximum" comment." into main 2023-09-20 15:55:18 +00:00
Tomasz Wasilczyk
2b1a0599c4 Don't depend on String8 cast to C string
Bug: 295394788
Test: m checkbuild
Change-Id: I5b86ae56250d409a23ab3f2bc72b725bcf6ab23e
2023-09-20 15:11:54 +00:00
Akilesh Kailash
c96daf11fc resolve merge conflicts of c449ba34d8 to udc-qpr-dev-plus-aosp am: 8b30afbdc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24808267

Change-Id: Ibd95665d6aa414f7c197e44301c558f48444f807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 03:25:23 +00:00
Akilesh Kailash
8b30afbdc1 resolve merge conflicts of c449ba34d8 to udc-qpr-dev-plus-aosp
Ignore-AOSP-First: Cherrypick from AOSP
Bug: 301165896
Test: Build
Change-Id: Ic8585b0d9602a244dc1a14d8d3302db1a93b0799
2023-09-20 01:55:27 +00:00