Colin Cross
bbca067d4b
Merge "Use 0 instead of NULL for comparison to char16_t" am: 6a79e8113a am: dc4af935d5 am: 1901114704 am: 41ad47e55a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1949458
Change-Id: If3a58bde6277971e7289eecef25b7f015d75b0bc
2022-01-14 00:26:18 +00:00
Colin Cross
41ad47e55a
Merge "Use 0 instead of NULL for comparison to char16_t" am: 6a79e8113a am: dc4af935d5 am: 1901114704
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1949458
Change-Id: I1095a1f57d4a91628f5ea8a2c7bdfb8c503eea19
2022-01-14 00:12:08 +00:00
Colin Cross
1901114704
Merge "Use 0 instead of NULL for comparison to char16_t" am: 6a79e8113a am: dc4af935d5
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1949458
Change-Id: Id42cfe8c3bc71311a075dc0d941fc480f13e0c64
2022-01-14 00:01:22 +00:00
Colin Cross
dc4af935d5
Merge "Use 0 instead of NULL for comparison to char16_t" am: 6a79e8113a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1949458
Change-Id: Ibabb4553adbe965cedf7866e1fa3b08f758eaece
2022-01-13 23:50:02 +00:00
Colin Cross
6a79e8113a
Merge "Use 0 instead of NULL for comparison to char16_t"
2022-01-13 23:29:42 +00:00
Colin Cross
02a3f958db
Use 0 instead of NULL for comparison to char16_t
...
musl libc defines NULL as nullptr, which is explicitly allowed by
C++11. nullptr_t cannot be implicitly cast to an integral type.
Use 0 instead.
Bug: 190084016
Test: m USE_HOST_MUSL=true host-native
Change-Id: I0c3b6c94cd69262f574414bf52494333f2f2645a
2022-01-13 13:41:59 -08:00
Keith Mok
357e09959f
Merge "Add checking for sparse file format"
2022-01-13 20:50:13 +00:00
Jiyong Park
fea77d9a32
Merge changes from topic "or_return" am: e060580c31 am: d1e6b85f7b am: 8a038ec1b0 am: b22a816013
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1945135
Change-Id: Ifd5f0f6b37efad12731c0de0fdc5cb49ee3599d3
2022-01-12 08:37:14 +00:00
Jiyong Park
549a4a638b
OR_RETURN supports status_t am: 705abe2d30 am: e1bd3f4b34 am: 29f45b2f1f am: 96413ff019
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1922318
Change-Id: I4c1dc92f6bcb231c6d3578454b1bb3959f8e2faf
2022-01-12 08:37:12 +00:00
Jiyong Park
b22a816013
Merge changes from topic "or_return" am: e060580c31 am: d1e6b85f7b am: 8a038ec1b0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1945135
Change-Id: Iab21eeb8460594f8b397960b849c2c4b3efe70e8
2022-01-12 08:18:34 +00:00
Jiyong Park
96413ff019
OR_RETURN supports status_t am: 705abe2d30 am: e1bd3f4b34 am: 29f45b2f1f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1922318
Change-Id: If776ce8309959cfb768bf9aa4928dccd33a3536f
2022-01-12 08:18:32 +00:00
Jiyong Park
8a038ec1b0
Merge changes from topic "or_return" am: e060580c31 am: d1e6b85f7b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1945135
Change-Id: I25e9c9a9466b60edcab3158104984041b06157ad
2022-01-12 08:01:54 +00:00
Jiyong Park
29f45b2f1f
OR_RETURN supports status_t am: 705abe2d30 am: e1bd3f4b34
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1922318
Change-Id: Id05e1b480c1f5acdd8d0a4ae2e8981b59b6a5f94
2022-01-12 08:01:52 +00:00
Jiyong Park
d1e6b85f7b
Merge changes from topic "or_return" am: e060580c31
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1945135
Change-Id: I463247c52b221a54b5c7f44e403cee81c10495dc
2022-01-12 07:44:39 +00:00
Jiyong Park
e1bd3f4b34
OR_RETURN supports status_t am: 705abe2d30
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1922318
Change-Id: I2b4dc2d0a305e95b80fe06a22d2bd69a5d238053
2022-01-12 07:44:37 +00:00
Jiyong Park
e060580c31
Merge changes from topic "or_return"
...
* changes:
Sort exported headers of libutils
OR_RETURN supports status_t
2022-01-12 07:27:41 +00:00
Treehugger Robot
9fa3e382ee
Merge "healthd: remove hridya@ from OWNERS file" am: da0756b575 am: a86dec2fe6 am: 0c0fe62ff9 am: 5a1c3012a7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935473
Change-Id: I1e96b0d04cae982cb6d31238b6b96e5dcf7fef84
2022-01-12 03:45:19 +00:00
Treehugger Robot
5a1c3012a7
Merge "healthd: remove hridya@ from OWNERS file" am: da0756b575 am: a86dec2fe6 am: 0c0fe62ff9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935473
Change-Id: Ifecdc575a53897c7fb378cba8a9cbebfc57484be
2022-01-12 03:26:46 +00:00
Treehugger Robot
0c0fe62ff9
Merge "healthd: remove hridya@ from OWNERS file" am: da0756b575 am: a86dec2fe6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935473
Change-Id: Ib95d3997a4cbff1741bbd4a5479a4fb3d1c84535
2022-01-12 03:12:10 +00:00
Treehugger Robot
a86dec2fe6
Merge "healthd: remove hridya@ from OWNERS file" am: da0756b575
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935473
Change-Id: Ife8656d14abbf2b297f53bdc40791e73c1dcb73b
2022-01-12 03:01:49 +00:00
Treehugger Robot
da0756b575
Merge "healthd: remove hridya@ from OWNERS file"
2022-01-12 02:34:11 +00:00
Jiyong Park
8b196a7336
Sort exported headers of libutils
...
Bug: N/A
Test: build
Change-Id: I658155371ca32a7e9ba7e82f8e43780c515df77b
2022-01-12 09:23:46 +09:00
Jiyong Park
705abe2d30
OR_RETURN supports status_t
...
This change provide a specialization of android::base::OkOrFail for
status_t. As a result, a statement whose type is status_t can be used
with OR_RETURN.
The specialization also provides conversion operators to Result<T,
StatusT> where StatusT is a wrapper type for status_t. This allows
OR_RETURN macro to be used in newer functions that returns Result<T,
StatusT>.
Example usage:
\#include <utils/ErrorsMacros.h>
status_t legacy_inner();
status_t legacy_outer() {
OR_RETURN(legacy_inner());
return OK;
}
Result<T, StatusT> new_outer() {
OR_RETURN(legacy_inner()); // the same macro
return T{...};
}
Bug: 209929099
Test: atest libutils_test
Change-Id: I0def0e84ce3f0c4ff6d508c202bd51902dfc9618
2022-01-12 09:20:27 +09:00
Maciej Żenczykowski
ad23a268c6
Merge changes from topic "canned_fs_config_sc_mainline_prod"
...
* changes:
[automerged blank] Merge "canned fs_config accepts multiple lines having the same path" am: 1d3b45e4fa am: 281bedd9d0 am: b1e5cd3857 am: d0746f98d6 2p: c0c59c6244
Merge "canned fs_config accepts multiple lines having the same path" am: 1d3b45e4fa am: 281bedd9d0 am: b1e5cd3857 am: d0746f98d6
2022-01-11 20:06:36 +00:00
Maciej Żenczykowski
f1b606d01e
Merge changes from topic "canned_fs_config_sc_mainline_prod"
...
* changes:
[automerged blank] Merge "canned_fs_config.cpp is written in C++" am: badd64bdbd am: cfce587a2c am: 960bd432f1 am: e598194cbf 2p: 5370c1b176
Merge "canned_fs_config.cpp is written in C++" am: badd64bdbd am: cfce587a2c am: 960bd432f1 am: e598194cbf
2022-01-11 20:06:36 +00:00
Ken Chen
e3bbbea100
Merge "Delete legacy library libqtaguid" am: 67b528f521 am: b118319a65 am: e0bfad3b20 am: 721cd61571
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938282
Change-Id: Ibf3fccb298965a154ae03af2132509c803685b27
2022-01-11 19:44:01 +00:00
Ken Chen
721cd61571
Merge "Delete legacy library libqtaguid" am: 67b528f521 am: b118319a65 am: e0bfad3b20
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938282
Change-Id: I6d12d3bb8eb0d08dbac774e7085538106f40ed36
2022-01-11 19:23:36 +00:00
Ken Chen
e0bfad3b20
Merge "Delete legacy library libqtaguid" am: 67b528f521 am: b118319a65
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938282
Change-Id: I71540b8339b68e8598d2c661a71d38e2af4ac668
2022-01-11 19:06:49 +00:00
Ken Chen
b118319a65
Merge "Delete legacy library libqtaguid" am: 67b528f521
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938282
Change-Id: I855a958154c8069ab718dc04802774c854b94995
2022-01-11 17:48:04 +00:00
Ken Chen
67b528f521
Merge "Delete legacy library libqtaguid"
2022-01-11 17:30:41 +00:00
Yi-yo Chiang
532f8028ec
Merge "Remove unused rootdir/avb/*-gsi.avbpubkey modules" am: 1eeee3db1a am: 5099a91634 am: bc906626ad am: 4b21c590b5
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938283
Change-Id: Id5d68193e5ec022e1f98fa6b79914730ed5fabad
2022-01-11 08:11:58 +00:00
Yi-yo Chiang
4b21c590b5
Merge "Remove unused rootdir/avb/*-gsi.avbpubkey modules" am: 1eeee3db1a am: 5099a91634 am: bc906626ad
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938283
Change-Id: I6718b849e63227e2781df23bf82f8ed343219632
2022-01-11 07:44:57 +00:00
Yi-yo Chiang
bc906626ad
Merge "Remove unused rootdir/avb/*-gsi.avbpubkey modules" am: 1eeee3db1a am: 5099a91634
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938283
Change-Id: I6868bbb3d8a5b14a79e8186cfdba63d5f92e1e70
2022-01-11 07:31:14 +00:00
Yi-yo Chiang
5099a91634
Merge "Remove unused rootdir/avb/*-gsi.avbpubkey modules" am: 1eeee3db1a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938283
Change-Id: I83c93807433081c75d089aed912543fcb6d62364
2022-01-11 07:11:25 +00:00
Yi-yo Chiang
1eeee3db1a
Merge "Remove unused rootdir/avb/*-gsi.avbpubkey modules"
2022-01-11 06:57:25 +00:00
Yi-yo Chiang
74ad59226d
Merge "libfs_avb: Export more utilities to facilitate VTS" am: c126ad8214 am: ce0cdb1a58 am: 51c240f5c4 am: 93432daac5
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940852
Change-Id: I2052f1dcede88f6dc1dfa2c33cce91fc56d10e1c
2022-01-11 06:48:59 +00:00
Yi-yo Chiang
93432daac5
Merge "libfs_avb: Export more utilities to facilitate VTS" am: c126ad8214 am: ce0cdb1a58 am: 51c240f5c4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940852
Change-Id: Iaa99b4612c502b776a9910db0e6cf6b3d4289b89
2022-01-11 06:32:36 +00:00
Yi-yo Chiang
51c240f5c4
Merge "libfs_avb: Export more utilities to facilitate VTS" am: c126ad8214 am: ce0cdb1a58
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940852
Change-Id: Ie228dbaf68e03849b16bf09fab32896cdcb83d9d
2022-01-11 06:01:34 +00:00
Yi-yo Chiang
ce0cdb1a58
Merge "libfs_avb: Export more utilities to facilitate VTS" am: c126ad8214
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940852
Change-Id: I79cbbee8b26a85bf3a2aaa34b8c2acbdefc2f782
2022-01-11 05:49:02 +00:00
Yi-yo Chiang
c126ad8214
Merge "libfs_avb: Export more utilities to facilitate VTS"
2022-01-11 05:36:25 +00:00
Bowgo Tsai
72f5c69498
Merge "libfs_avb: updating run_tests.sh" am: f452a42db2 am: 9520bbf5de am: c3984d5e77 am: be4a609948
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1942373
Change-Id: I777833f7abc40317b243da1c6f2e3b9b915d351f
2022-01-11 05:30:16 +00:00
Treehugger Robot
9f1b48af7a
Merge "fastboot: make init_boot.img optional" am: 0b5bfdce7d am: e68a3e7299 am: d2cb0b0ea6 am: 7bd679ca7e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943881
Change-Id: Ib27c72b84e8d83f4299f2ebba38d911452a2ae16
2022-01-11 05:29:15 +00:00
Bowgo Tsai
be4a609948
Merge "libfs_avb: updating run_tests.sh" am: f452a42db2 am: 9520bbf5de am: c3984d5e77
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1942373
Change-Id: I894f88fc4c5bbf383ad03db0f8bd286e9c882a3b
2022-01-11 05:06:42 +00:00
Treehugger Robot
7bd679ca7e
Merge "fastboot: make init_boot.img optional" am: 0b5bfdce7d am: e68a3e7299 am: d2cb0b0ea6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943881
Change-Id: I61e6627ea673e405dc01df39b26024788180a08f
2022-01-11 05:05:34 +00:00
Bowgo Tsai
c3984d5e77
Merge "libfs_avb: updating run_tests.sh" am: f452a42db2 am: 9520bbf5de
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1942373
Change-Id: Ied32bc655a5105b99bc91d185489add5068ae105
2022-01-11 04:40:40 +00:00
Treehugger Robot
d2cb0b0ea6
Merge "fastboot: make init_boot.img optional" am: 0b5bfdce7d am: e68a3e7299
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943881
Change-Id: I9cded9bf3973402f9eee40b274a441a9efd9bd5a
2022-01-11 04:39:32 +00:00
Jaegeuk Kim
665a1e7c93
Merge "Allow to run fsck.f2fs in first_stage_ramdisk" am: 8b7e76962e am: 4cdd4089a5 am: 90e5745845 am: 098322aae5
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943363
Change-Id: I2ad3cb3552644969aae24ba26d430e89671fa07b
2022-01-11 04:32:22 +00:00
Bowgo Tsai
9520bbf5de
Merge "libfs_avb: updating run_tests.sh" am: f452a42db2
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1942373
Change-Id: I2d68d8d01d30006bf1a97f4080a7560bf186b63f
2022-01-11 04:22:35 +00:00
Treehugger Robot
e68a3e7299
Merge "fastboot: make init_boot.img optional" am: 0b5bfdce7d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943881
Change-Id: I9658fe384fdde89b8fdb9a97ba03fb9867c67095
2022-01-11 04:21:56 +00:00
Jaegeuk Kim
098322aae5
Merge "Allow to run fsck.f2fs in first_stage_ramdisk" am: 8b7e76962e am: 4cdd4089a5 am: 90e5745845
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1943363
Change-Id: I39e34935a06a876071083429cc0673f3ee3582ba
2022-01-11 04:06:47 +00:00