Commit Graph

49176 Commits

Author SHA1 Message Date
Hans Boehm 029b12ebde Fix wp and sp comparison bugs
Make clear() actually clear wp m_refs, so that nulls compare equal.

Make equality consistent with < and >, ensuring that a weak pointer
cannot be both equal to and greater than another.

Don't rely on the built-in < and > operators to correctly order
different objects. The standard does not guarantee that, and there is
a risk of compiler relying on that lack of guarantee.

Remove unnecessary comparison overloads, especially those
comparing a wp<> to an sp<>.

Change the remaining wp<> to sp<> comparisons to check for equivalence
of the mRefs pointer instead of the object address, thus eliminating
the dubious equal comparison result for a dead wp<> and an sp<> that
happen to point to the same object address.

Add comparison tests.

Test: Treehugger, boot AOSP, atest RefBase
Bug: 126922090
Change-Id: I15911150e0fc85ace2c4b77d337826e12793c690
2019-03-09 21:41:37 -08:00
Christopher Ferris fdc5bc88d9 Merge "Add unistd.h to includes in Regs.h" am: fdfb9a0113 am: fb62d03824
am: fae118aab2

Change-Id: Id5fa85053dfce84393c343f9ff2ccfa173e73f8c
2019-03-09 13:38:05 -08:00
Christopher Ferris fae118aab2 Merge "Add unistd.h to includes in Regs.h" am: fdfb9a0113
am: fb62d03824

Change-Id: Id0356314f4f162fbad485edc6ed76ea339df31bc
2019-03-09 13:33:56 -08:00
Christopher Ferris fb62d03824 Merge "Add unistd.h to includes in Regs.h"
am: fdfb9a0113

Change-Id: I983d1df827a6f4dccdb3cfd4a240a2451c21882b
2019-03-09 13:29:52 -08:00
Christopher Ferris fdfb9a0113 Merge "Add unistd.h to includes in Regs.h" 2019-03-09 21:21:27 +00:00
Gavin Corkery 8d73048209 Merge "Rename data/pkg_staging to data/app-staging." 2019-03-09 12:41:28 +00:00
Elliott Hughes abc51e5e8b Merge "init: use PLOG rather than strerror." am: 71c084d07e am: f09e388f95
am: c721eccf01

Change-Id: I0bcee5ef6e4bebc99cb47ff016f827e6d35421cd
2019-03-08 18:24:51 -08:00
Elliott Hughes c721eccf01 Merge "init: use PLOG rather than strerror." am: 71c084d07e
am: f09e388f95

Change-Id: I237b05607820c6258f7f0f493857efae2452de60
2019-03-08 18:18:42 -08:00
Elliott Hughes f09e388f95 Merge "init: use PLOG rather than strerror."
am: 71c084d07e

Change-Id: I221b82a773282b49de365ee146b24c2d2066e83c
2019-03-08 18:14:32 -08:00
Treehugger Robot 71c084d07e Merge "init: use PLOG rather than strerror." 2019-03-09 02:04:56 +00:00
Wei Wang 0b4fad63ad Merge "Set cg_file_data_ to null when initialization failed" am: f3762004a3 am: 94f26c2a1d
am: 1f01e3415e

Change-Id: I077da425c3f82b441c64c1384dcb8bbf1cb6db72
2019-03-08 16:29:31 -08:00
Wei Wang 1f01e3415e Merge "Set cg_file_data_ to null when initialization failed" am: f3762004a3
am: 94f26c2a1d

Change-Id: I7b64cda65e62a982bc3c3c55ba04a7f6979ce396
2019-03-08 16:25:20 -08:00
Wei Wang 94f26c2a1d Merge "Set cg_file_data_ to null when initialization failed"
am: f3762004a3

Change-Id: I32631d26fcf46389c5667db7d6bdf39f64af2a64
2019-03-08 16:21:11 -08:00
Treehugger Robot f3762004a3 Merge "Set cg_file_data_ to null when initialization failed" 2019-03-09 00:15:05 +00:00
Xiaoyong Zhou 27c13df54b Merge "Change mini-keyctl command format." am: 34e1b402a6 am: 3c6e86bc11
am: 4b0a6092cc

Change-Id: I6e4179f6a2b4dfece070d196d343e5b497f37385
2019-03-08 16:08:30 -08:00
The Android Open Source Project 9ee373a529 DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master
Bug: 127812889
Change-Id: Idddc51e980d089c4923bf3a05dd33b7c94ed1f92
2019-03-08 15:57:00 -08:00
Xiaoyong Zhou 4b0a6092cc Merge "Change mini-keyctl command format." am: 34e1b402a6
am: 3c6e86bc11

Change-Id: I3b668a33eb00811f092b54be1210ff5dbd54413c
2019-03-08 15:56:52 -08:00
Xiaoyong Zhou 3c6e86bc11 Merge "Change mini-keyctl command format."
am: 34e1b402a6

Change-Id: I2bcf387368cd93852c9a0d7173cd5e37f49ded78
2019-03-08 15:43:18 -08:00
Treehugger Robot 34e1b402a6 Merge "Change mini-keyctl command format." 2019-03-08 23:17:01 +00:00
Casey Dahlin 0e113851a5 Add unistd.h to includes in Regs.h
This is required to use pid_t, but by luck nobody noticed its absence
until the Fuchsia build.

Test: Code now builds inside Fuchsia
2019-03-08 15:04:48 -08:00
Elliott Hughes 076305e4fb init: use PLOG rather than strerror.
Test: builds
Change-Id: Ifdba8e7fa4cd5c852946bb0f398382f2d64674cd
2019-03-08 12:34:53 -08:00
Josh Gao 9909c13ad9 Merge "Restrict scanning port range, not emulator count" am: e6413fcd94 am: b4954166ac
am: 4b868d648b

Change-Id: I79ce65ada9dd071b1eba7743d5e3d5212ce68fef
2019-03-08 12:27:57 -08:00
Josh Gao 4b868d648b Merge "Restrict scanning port range, not emulator count" am: e6413fcd94
am: b4954166ac

Change-Id: I1b9b249c19eeed8c0a762400d344c4c806626d35
2019-03-08 12:10:28 -08:00
Josh Gao b4954166ac Merge "Restrict scanning port range, not emulator count"
am: e6413fcd94

Change-Id: I35fc9710f1025c300fc56d989e9735aa10e2bb20
2019-03-08 11:56:23 -08:00
Josh Gao e6413fcd94 Merge "Restrict scanning port range, not emulator count" 2019-03-08 19:29:43 +00:00
android-build-team Robot 5d1d32dcbf Snap for 5240760 from 20ac1203a3 to pi-platform-release
Change-Id: I6bbede2f8c74a9f344df6f3c713de709eb79cd26
2019-03-08 18:40:29 +00:00
Wei Wang d71d30179c Set cg_file_data_ to null when initialization failed
Cannot really do calls if initialization failed.
Also fix LOG usage.

But: 124774415
Test: Build
Change-Id: Ifd7db90cfee51ba5830e1d4db8f8d19b5bc9feba
2019-03-08 10:18:06 -08:00
Mark Salyzyn 172b3113bf Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()" am: 6c5c085e41 am: bd15393281
am: 07503d3eef

Change-Id: I860abe7396e2b377c6c2f238cc6640f32a73cb91
2019-03-08 10:02:35 -08:00
Xiaoyong Zhou b29b27ec7f Change mini-keyctl command format.
This CL change the mini-keyctl tool to make it compitable with libkeyctl
tool to make it more useful.

Bug: 112038861
Test: mini-keyctl padd asymmetric 'desc' .fs-verity < /path/to/cert.der
Test: mini-keyctl unlink <key_id> <keyring_id>
Test: mini-keyctl restrict_keyring <keyring_id>

Change-Id: I950f07c7718f173823ce5a5cd08e0d1a0e23a007
2019-03-08 09:59:42 -08:00
Mark Salyzyn 07503d3eef Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()" am: 6c5c085e41
am: bd15393281

Change-Id: Iebd9611b2fc18a6fa9f538a0d0be1d596ace0295
2019-03-08 09:58:47 -08:00
Mark Salyzyn bd15393281 Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()"
am: 6c5c085e41

Change-Id: Ifa8e1c4bbdc65b45e7ca2abc0e2271d6daedad64
2019-03-08 09:22:53 -08:00
Mark Salyzyn 6c5c085e41 Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()" 2019-03-08 17:05:03 +00:00
Gavin Corkery ad0b2473dc Rename data/pkg_staging to data/app-staging.
Test: atest apex_e2e_tests
Bug: 126330086

Change-Id: Ic5729d60046e8825a2a94e3c3483ea8232a69ed2
2019-03-08 15:47:25 +00:00
Roland Levillain 2144c6703e Merge "Fix a typo in linker configuration comments." am: ecef987a35 am: 58e3b61d1e
am: fcd734a433

Change-Id: I5f5bd69b84688456615ea4027479ed8363e122de
2019-03-08 04:05:52 -08:00
Roland Levillain fcd734a433 Merge "Fix a typo in linker configuration comments." am: ecef987a35
am: 58e3b61d1e

Change-Id: I8ed32707e2c87b1c7808b53f0be93b07c0c87870
2019-03-08 03:58:55 -08:00
Roland Levillain 58e3b61d1e Merge "Fix a typo in linker configuration comments."
am: ecef987a35

Change-Id: I0751095b88ad8acd0e712ee19fdd8d439b63b2d8
2019-03-08 03:55:48 -08:00
Roland Levillain ecef987a35 Merge "Fix a typo in linker configuration comments." 2019-03-08 11:48:43 +00:00
Tao Bao a82fc1b183 Merge "mkbootimg: print addresses and offsets in hex" am: b778c44c07 am: 06e721c3e2
am: e46b232209

Change-Id: I1f53c731e5280d28035b382f3946f03136249458
2019-03-07 23:07:50 -08:00
Tao Bao e46b232209 Merge "mkbootimg: print addresses and offsets in hex" am: b778c44c07
am: 06e721c3e2

Change-Id: Ide9e86f4298e10c6885f4c0dc17ea83c7e10e882
2019-03-07 23:03:40 -08:00
Tao Bao 06e721c3e2 Merge "mkbootimg: print addresses and offsets in hex"
am: b778c44c07

Change-Id: I37035ea72a49f8ef8ae2a8c7230fb3f9ed502f69
2019-03-07 22:59:30 -08:00
Tao Bao b778c44c07 Merge "mkbootimg: print addresses and offsets in hex" 2019-03-08 06:31:05 +00:00
Josh Gao b1aa106e44 Merge "Revert "Revert "adbd: switch the default USB implementation.""" am: f97193d96f am: d9e3421558
am: 3fafb971d9

Change-Id: Ie98d0d8b581fb53d0e7ecc64f55744fa851e3174
2019-03-07 21:14:18 -08:00
Dongwon Kang 9778fdaec4 Merge "allow_all_shared_libs for media namespace in ld.config.legacy.txt" am: fc6e441a1a am: 6cec105df9
am: 3642244f9d

Change-Id: I6e12d0eecfce92436415c26e2210f76ef2fbb8ce
2019-03-07 21:11:05 -08:00
Josh Gao 3fafb971d9 Merge "Revert "Revert "adbd: switch the default USB implementation.""" am: f97193d96f
am: d9e3421558

Change-Id: I1a742436986ce08235f1d6b5901afd3a33f26d2b
2019-03-07 20:53:32 -08:00
Dongwon Kang 3642244f9d Merge "allow_all_shared_libs for media namespace in ld.config.legacy.txt" am: fc6e441a1a
am: 6cec105df9

Change-Id: I254fc88fa9ab1f343d9d3151459121c438039563
2019-03-07 20:47:26 -08:00
Josh Gao d9e3421558 Merge "Revert "Revert "adbd: switch the default USB implementation."""
am: f97193d96f

Change-Id: I398b7d627745e140263cca4e2835d4ef7bd03f1f
2019-03-07 20:42:02 -08:00
Dongwon Kang 6cec105df9 Merge "allow_all_shared_libs for media namespace in ld.config.legacy.txt"
am: fc6e441a1a

Change-Id: I28cbccff6e4d4e75c6baca429ae8a1fc4bf16a3e
2019-03-07 20:19:50 -08:00
Treehugger Robot f97193d96f Merge "Revert "Revert "adbd: switch the default USB implementation.""" 2019-03-08 03:29:41 +00:00
Dongwon Kang fc6e441a1a Merge "allow_all_shared_libs for media namespace in ld.config.legacy.txt" 2019-03-08 02:46:06 +00:00
Pirama Arumuga Nainar 5d7f84144d Support zero-length mapped files
Bug: http://b/119818070 "app crashes when reading asset of zero length"

Add support for zero-length mappings for the Windows code path as well.

Test: ran libbase_test on Windows under wine.
Change-Id: Iccb65fa800c636444100c9369f41e36d24a53a99
2019-03-07 16:12:55 -08:00