Commit Graph

59638 Commits

Author SHA1 Message Date
TreeHugger Robot 7499783fd9 Merge changes Idaa27ce2,I06644a72,I453c63fe into rvc-dev
* changes:
  processgroup: Set min_sdk_version
  gralloc: Set min_sdk_version
  libcutils: Set min_sdk_version
2020-05-12 09:00:50 +00:00
android-build-team Robot 06760075e1 Snap for 6485046 from 3b1f59ce50 to mainline-release
Change-Id: Ibf2f6f313f9f290b284187fca5ce0d8d28e9fb36
2020-05-12 07:05:08 +00:00
Maciej Zenczykowski 3b1f59ce50 Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev am: ce7d0ba607
Change-Id: I6d739a1dd5e7c692abe97184f32e54ebba6e10f3
2020-05-12 02:10:59 +00:00
Maciej Żenczykowski 9c36e5d1ea libnetutils/packet.c - fix a raw socket reception race am: 74346aac9c
Change-Id: Ie58559a137aca77b4ded206d1518e898e46f1f8f
2020-05-12 02:10:57 +00:00
Maciej Żenczykowski f97d2bf276 libnetutils/packet.c - fix a socket leak on bind error am: b9add4a315
Change-Id: Ic5a571fe64582a696679f2a4b7f9aa3a5f5a21ca
2020-05-12 02:10:55 +00:00
Maciej Zenczykowski ce7d0ba607 Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev
* changes:
  libnetutils/packet.c - create socket with close-on-exec
  libnetutils/packet.c - fix a raw socket reception race
  libnetutils/packet.c - fix a socket leak on bind error
2020-05-12 01:57:56 +00:00
TreeHugger Robot e825277a98 Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev am: 8601d37213
Change-Id: I3e25335c4c1b657a2400f6878d0200955e6422c5
2020-05-12 00:49:38 +00:00
TreeHugger Robot 8601d37213 Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev 2020-05-12 00:32:22 +00:00
TreeHugger Robot 7925cae7f9 Merge "vts_processgroup_validate_test: make deps static" into rvc-dev am: f2caf7de6c
Change-Id: I1b94e1bf51279ea209f747cbdef039874266f022
2020-05-11 23:48:13 +00:00
TreeHugger Robot f2caf7de6c Merge "vts_processgroup_validate_test: make deps static" into rvc-dev 2020-05-11 23:33:28 +00:00
Christopher Ferris 1500d0e7a9 Fix mac build.
Add an inline for mmap64 to use on mac.

Bug: 155662887
Bug: 156053599

Test: Builds.
Change-Id: Id02e2c2f40acea2bdef604e9b80b70a85a941927
(cherry picked from commit 8a6dff22dc)
2020-05-11 23:07:53 +00:00
Maciej Żenczykowski ecfb05d4ce libnetutils/packet.c - create socket with close-on-exec
This prevents fork/exec leaking sockets to child processes.

Test: builds, atest
Bug: 155297277
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I57cb2003dd75b0bc5528978fd131730273e37a43
Merged-In: I57cb2003dd75b0bc5528978fd131730273e37a43
2020-05-11 15:58:02 -07:00
Maciej Żenczykowski 74346aac9c libnetutils/packet.c - fix a raw socket reception race
A socket created bound to a specific protocol can receive packets before
it's bound to a specific interface/mac.

It's best to rely on the bind().

This replicates the way packet sockets are created in external/android-clat.
See: ring.c ring_create() and clatd.c configure_packet_socket()

Test: builds, atest
Bug: 155297277
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I569d2b81a396f352ab5d1b71bd5ad0d96217aab1
Merged-In: I569d2b81a396f352ab5d1b71bd5ad0d96217aab1
2020-05-11 15:57:53 -07:00
Maciej Żenczykowski b9add4a315 libnetutils/packet.c - fix a socket leak on bind error
and clean up the code a little bit while at it.

Test: builds, atest
Bug: 155297277
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I01a10e36f852cde1b93a91f95b51294a434885ab
Merged-In: I01a10e36f852cde1b93a91f95b51294a434885ab
2020-05-11 15:57:44 -07:00
Yifan Hong 01840c53e8 vts_processgroup_validate_test: make deps static
Test: pass
Fixes: 155959743
Change-Id: I730526955a40ae00a97f487e423a00c743f75d53
(cherry picked from commit 2572f23af8)
Merged-In: I730526955a40ae00a97f487e423a00c743f75d53
2020-05-11 12:32:26 -07:00
Ruchir Rastogi c7de5847f1 Merge "Use proper platform version checks (libstats)" into rvc-dev am: b797431342
Change-Id: Iaa9b4d4e650c23cd5fc761047919fad8cf82b837
2020-05-11 18:00:34 +00:00
Woody Lin ae467dea9b InitFatalReboot: Trigger panic explicitly for init_fatal_panic am: 8fb6e3fdaf
Change-Id: Ic38fbd15da49dd508d3bbe3b7ad34313e8919c40
2020-05-11 18:00:21 +00:00
Ruchir Rastogi b797431342 Merge "Use proper platform version checks (libstats)" into rvc-dev 2020-05-11 17:22:24 +00:00
Woody Lin 8fb6e3fdaf InitFatalReboot: Trigger panic explicitly for init_fatal_panic
The exit of init panics the system *after* process context (mm, stack,
...etc.) are recycled, according to Linux kernel's 'do_exit'
implementation. To preserve most init process context for debugging,
triggers the panic via proc-sysrq explicitly.

Note: after this change, there will be no "Attempt to kill init" panic
when androidboot.init_fatal_panic is set.

Test: Insert data abort fault in init, the full process context is
      preserved in memory dump captured after panic.
Bug: 155940351
Change-Id: I3393bd00f99b8cb432cfa19a105b7d636b411764
(cherry picked from commit be1cf9006a)
2020-05-11 14:50:27 +00:00
Lorenzo Colitti a789cb5bbe Simplify code that parses ifa_flags. am: c00d57d353
Change-Id: I4f5627d268050c18b3b4dc41d56da2675ff3c8f1
2020-05-11 13:53:48 +00:00
Jooyung Han d1d5fdfc2a processgroup: Set min_sdk_version
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Merged-In: Idaa27ce24cc13d13145eaef85a08b9033922c7bc
Change-Id: Idaa27ce24cc13d13145eaef85a08b9033922c7bc
(cherry picked from commit 4f55f3efd3)
2020-05-11 17:45:27 +09:00
Jooyung Han 3c20c62cdd gralloc: Set min_sdk_version
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Merged-In: I06644a725eb8f4ce0c7d8e1f09359b55e1b668d7
Change-Id: I06644a725eb8f4ce0c7d8e1f09359b55e1b668d7
(cherry picked from commit 72a6b3137e)
2020-05-11 17:44:29 +09:00
Jooyung Han 86455d7f87 libcutils: Set min_sdk_version
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Merged-In: I453c63fe29607ea0312da5465b03c741486fb670
Change-Id: I453c63fe29607ea0312da5465b03c741486fb670
(cherry picked from commit 88f00f2d43)
2020-05-11 17:43:04 +09:00
Lorenzo Colitti 80ee49df2c Parse IFA_F_* values above 0x80. am: 3991ca5657
Change-Id: I56d2d068aa2b3cc4717caa0aff7f4698f5e9d5d1
2020-05-11 08:16:27 +00:00
Lorenzo Colitti c00d57d353 Simplify code that parses ifa_flags.
When parsing an RTM_NEWADDR or RTM_DELADDR, ifaddr is always
present (unless the message is invalid). So ifaddr->ifa_flags is
always known before any attributes are parsed.

Bug: 155005831
Test: atest NetworkStackNextIntegrationTests:IpClientIntegrationTest continues to apss
Change-Id: Id1998faccca7d81c1b7f3e85e4912aa22919e94a
2020-05-11 11:37:17 +09:00
Lorenzo Colitti 3991ca5657 Parse IFA_F_* values above 0x80.
In RTM_NEWADDR messages, the first 8 flags are reported in the
ifa_flags field in struct ifaddrmsg, but flags above 0x80 are
reported in the IFA_FLAGS attribute. NetlinkEvent currently only
looks at ifa_flags, so it cannot see higher-value flags such as
IFA_F_STABLE_PRIVACY. Fix this by parsing the IFA_FLAGS
attribute.

Bug: 155005831
Test: makes new test in aosp/1295495 pass
Original-Change: https://android-review.googlesource.com/1295670
Merged-In: I723f1106cbcea2186fc6452305942a0f8301fd2a
Change-Id: I723f1106cbcea2186fc6452305942a0f8301fd2a
2020-05-11 11:29:59 +09:00
android-build-team Robot 3a4910bc0e Snap for 6479434 from 908ff8b4e7 to mainline-release
Change-Id: Id41a441eab0c9b10a5986fe4195c72352feda4ef
2020-05-10 07:19:49 +00:00
Chen Zhu 908ff8b4e7 Merge "Add test config for adbd_test and apply MainlineTestModuleController to it" into rvc-dev am: 8950624662
Change-Id: Ifd6f6f0eb0cc2de2d4e5683762f43d6361a3a228
2020-05-09 03:01:08 +00:00
Chen Zhu 8950624662 Merge "Add test config for adbd_test and apply MainlineTestModuleController to it" into rvc-dev 2020-05-09 02:48:48 +00:00
Chen Zhu 5daea5a6a2 Add test config for adbd_test and apply MainlineTestModuleController to it
to only run the tests when com.google.android.adbd is

installed on device.

Bug: 154845935
Test: m mts && mts-tradefed run mts-adbd
Change-Id: I2f203d25288580a07391703e2b28df54479a69f0
2020-05-08 16:47:07 -07:00
android-build-team Robot 134ca04896 Snap for 6474498 from 8930951055 to mainline-release
Change-Id: I1b552bc589bbbbf2f988c2578da412e49d0992dc
2020-05-08 07:11:17 +00:00
Christopher Ferris de38b1a356 Change call to mmap64.
The code was using an off64_t but calling mmap. This caused the code
to abort on 32 bit.

Add a unit test that would abort on the previous version.

Bug: 155662887

Test: New unit test passes.
Change-Id: I7a6efbc0d4227403c3d08a08deea56f239382157
Merged-In: I7a6efbc0d4227403c3d08a08deea56f239382157
(cherry picked from commit 7b9f35c9de)
2020-05-07 17:45:30 -07:00
TreeHugger Robot 8930951055 Merge "first_stage_init: add support to skip module load failures" into rvc-dev am: 1cf1238d4a
Change-Id: I4f58c8df4863e9685d0154eef6eeb28e9cdec5a4
2020-05-07 22:02:32 +00:00
TreeHugger Robot 1cf1238d4a Merge "first_stage_init: add support to skip module load failures" into rvc-dev 2020-05-07 21:48:05 +00:00
Will McVicker f3483ec6a0 first_stage_init: add support to skip module load failures
Extend androidboot.first_stage_console cmdline property to enable
skipping module load failures without stopping at a serial console. This
is useful for GKI development.

Set androidboot.first_stage_console=2 for this behavior.

Bug: 155296582
Test: verify behavior for values 0, 1, and 2
Merged-In: I068c631a22c848e45a421b297b1acae1b3deb3c1
Change-Id: I068c631a22c848e45a421b297b1acae1b3deb3c1
(cherry picked from commit 6c5f82642b)
2020-05-07 21:47:17 +00:00
David Anderson caa2743f97 Merge "libfiemap: Remove brittle tests." into rvc-dev am: 7d50e96978
Change-Id: I6f3640961d1369d4f4282b4ee2d923af2949294c
2020-05-07 19:45:23 +00:00
David Anderson c2732bda42 Merge "fastboot: Fix snapshot-update merge behavior." into rvc-dev am: 4adbeb470f
Change-Id: I89477c995a82f6f4fbd38d3393538feb1c4e3c16
2020-05-07 19:45:09 +00:00
David Anderson 7d50e96978 Merge "libfiemap: Remove brittle tests." into rvc-dev 2020-05-07 19:34:04 +00:00
David Anderson 4adbeb470f Merge "fastboot: Fix snapshot-update merge behavior." into rvc-dev 2020-05-07 19:32:43 +00:00
Ruchir Rastogi 4ae167e829 Use proper platform version checks (libstats)
Test: bit libstatspush_compat_test
Bug: 146019024
Change-Id: If99a7067944ddfbe30bb0ddfe586a337a94d4c07
2020-05-07 12:31:39 -07:00
android-build-team Robot 6bfc05d555 Snap for 6470414 from c6d324b73a to mainline-release
Change-Id: Iab96993dc6e67e92fd7ed8f0262ffb6562883f28
2020-05-07 07:07:10 +00:00
TreeHugger Robot c6d324b73a Merge "Using ABB for install-multi." into rvc-dev am: 67a2bebf74
Change-Id: Idd0093391d8da02ceda7d34b330782eb22f6c132
2020-05-06 23:16:25 +00:00
TreeHugger Robot 67a2bebf74 Merge "Using ABB for install-multi." into rvc-dev 2020-05-06 23:00:02 +00:00
Yifan Hong 82035d6b82 libsnapshot: fix incorrect assumption of cow images
libsnapshot used to assume CoW images are always mapped
with device mapper, and call GetDeviceString directly.
However, in tests, it is possible that it is mapped as loop
devices. Fix the incorrect assumption and calls
IImageManager::GetMappedImageDevice instead.

Test: libsnapshot_fuzzer with corpus
Bug: 154633114
Change-Id: I1ec39744480e514ae7a7902643ed863e0ca0a340
(cherry picked from commit e6c1a84276)
Merged-In: I1ec39744480e514ae7a7902643ed863e0ca0a340
2020-05-06 15:12:22 -07:00
Alex Buynytskyy 13e98eaf72 Using ABB for install-multi.
ABB uses single shared CMD for all operations which improves
reliability.

Bug: b/153486595
Fixes: 153486595
Test: atest adb_test adbd_test fastdeploy_test
Change-Id: I1e3da63882c980811ed2e9f5556732b24a041ce5
Merged-In: I1e3da63882c980811ed2e9f5556732b24a041ce5
2020-05-06 14:10:56 -07:00
android-build-team Robot b68db40fc1 Snap for 6465939 from 9842adf768 to mainline-release
Change-Id: Iefa042e6e7be25dad189263b07579decf32433b0
2020-05-06 07:15:46 +00:00
David Anderson 3afca7c11e libfiemap: Remove brittle tests.
libfiemap functionality is extensively tested via libsnapshot, gsid, and
fiemap_writer_test. However those tests rely on the configuration of the
device, and libfiemap has fairly different behavior based on whether FBE
or metadata encryption is in use. (The former will use loop devices, the
latter uses dm-linear).

To expand coverage, we added tests with very complicated nesting,
creating fiemaps on a rw partition mounted off a device backed by a
fiemap. Unsurprisingly, this was brittle to begin with, and now
consistently fails due to the intermediate partition not having
sepolicy.

Given the preference toward metadata encryption, and the fact that the
FBE mode will still be properly tested via VTS, let's just remove these
tests.

Bug: 148874852
Test: fiemap_image_test
Change-Id: I7be7d44dea81508505c050ed995b3b78086ad35f
Merged-In: I7be7d44dea81508505c050ed995b3b78086ad35f
2020-05-05 19:16:21 -07:00
Tim Murray 9842adf768 Merge "mark atrace buffers as uninitialized" into rvc-dev 2020-05-05 22:33:04 +00:00
Tim Murray 0f85154117 mark atrace buffers as uninitialized
The atrace buffer does not need to be zero-initialized every time.

Test: memset calls from atrace_{begin,end}_body are gone
bug 155788214

Change-Id: I8082b6a9e6d6328f4aee3a22137977e9fae21933
2020-05-05 18:37:02 +00:00
android-build-team Robot 6c3e968560 Snap for 6462261 from b6ae75ef00 to mainline-release
Change-Id: Ib0c4114b0fc98e4bd6181fc9b174704e9772423e
2020-05-05 07:03:16 +00:00