Commit graph

59008 commits

Author SHA1 Message Date
Alex Buynytskyy
1eb7652f0c Passing additional flags to incremental installation. am: 74e9e3c27a
Change-Id: Iec24ab75bf7990a73d8b55361907a5c408f53209
2020-05-16 00:52:17 +00:00
Alex Buynytskyy
74e9e3c27a Passing additional flags to incremental installation.
Bug: 150803885
Test: atest adb_test adbd_test fastdeploy_test
Change-Id: Ifa9b9e570259d35eb0121817bbb791044c6efcfd
Merged-In: Ifa9b9e570259d35eb0121817bbb791044c6efcfd
2020-05-14 21:00:10 +00:00
Jooyung Han
ebce9ac166 Set min_sdk_version to be part of mainline modules am: 7937f29be8
Change-Id: I072e434e1893512e433cf1bbf83804a8a210f31e
2020-05-13 07:35:23 +00:00
Jooyung Han
7937f29be8 Set min_sdk_version to be part of mainline modules
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: Ida890adfe6dfac79267fc0e18b63d2330266438c
Change-Id: Ida890adfe6dfac79267fc0e18b63d2330266438c
(cherry picked from commit 7ea0d74bc8)
2020-05-13 12:10:36 +09:00
Christopher Ferris
9407efae2e Merge "Fix mac build." into rvc-dev am: 310b46c1ca
Change-Id: I133530e9ff17149241436870ca877c58ec8f3a97
2020-05-12 17:38:46 +00:00
Christopher Ferris
2a7f55cd19 Merge "Change call to mmap64." into rvc-dev am: 99dfe5ebba
Change-Id: I0e5a4d43bc06cca14aecd79de12ddc58d5373f62
2020-05-12 17:38:43 +00:00
Christopher Ferris
310b46c1ca Merge "Fix mac build." into rvc-dev 2020-05-12 17:17:25 +00:00
Christopher Ferris
99dfe5ebba Merge "Change call to mmap64." into rvc-dev 2020-05-12 17:17:25 +00:00
TreeHugger Robot
6e95b881aa Merge changes Idaa27ce2,I06644a72,I453c63fe into rvc-dev am: 7499783fd9
Change-Id: Ifa4d5b1872cf5d93f8c389b6912306d6f72e78dc
2020-05-12 09:16:36 +00:00
Jooyung Han
6024d5f580 gralloc: Set min_sdk_version am: 3c20c62cdd
Change-Id: Iece8067f824e24eaf069651e7055765604dd2ebf
2020-05-12 09:16:35 +00:00
Jooyung Han
6e0951ac9c libcutils: Set min_sdk_version am: 86455d7f87
Change-Id: I30db0c7d9063957915f86191c9d89a13a8ce1884
2020-05-12 09:16:32 +00:00
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
Maciej Zenczykowski
b3b15d1738 Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev am: ce7d0ba607
Change-Id: Ib9381a872980db7d506625e7645618e80f375290
2020-05-12 02:11:06 +00:00
Maciej Żenczykowski
e6877b7f16 libnetutils/packet.c - fix a raw socket reception race am: 74346aac9c
Change-Id: I9c57bf11896d4bb975a1f053dee9c23e61c013f2
2020-05-12 02:11:05 +00:00
Maciej Żenczykowski
991842c681 libnetutils/packet.c - fix a socket leak on bind error am: b9add4a315
Change-Id: I1612dd0cf96a48d64e10efea86f695563ee6cfe3
2020-05-12 02:11:02 +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
fca9e4c3b8 Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev am: 8601d37213
Change-Id: I7e19e98c9ddece2cdccbf16eef72f0146cf2a537
2020-05-12 00:49:26 +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
4e8680f440 Merge "vts_processgroup_validate_test: make deps static" into rvc-dev am: f2caf7de6c
Change-Id: I0838b783f3de646e48bb0cfd5725245e4d408e0d
2020-05-11 23:47:53 +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
ea3a566de0 Merge "Use proper platform version checks (libstats)" into rvc-dev am: b797431342
Change-Id: I403446a3981375a13085894d637d4d67c2c65197
2020-05-11 18:00:33 +00:00
Woody Lin
8c2716135b InitFatalReboot: Trigger panic explicitly for init_fatal_panic am: 8fb6e3fdaf
Change-Id: I6e1ba46a5209eb0fb90c94936c33fe345b615e70
2020-05-11 18:00:22 +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
eb5711913c Simplify code that parses ifa_flags. am: c00d57d353
Change-Id: I6459879e74cdc1b78cfe956ffd3bbac1dbe1db48
2020-05-11 13:53:42 +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
9952566a32 Parse IFA_F_* values above 0x80. am: 3991ca5657
Change-Id: I9e5ff42e9a34137b005765cacaa159b2af6f564a
2020-05-11 08:16:56 +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
Chen Zhu
5b59f27e2c Merge "Add test config for adbd_test and apply MainlineTestModuleController to it" into rvc-dev am: 8950624662
Change-Id: Iae50f577bb1233554a0d6a5101a30312f969b0f0
2020-05-09 03:00:51 +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
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
11a5105f05 [automerger skipped] Merge "first_stage_init: add support to skip module load failures" into rvc-dev am: 1cf1238d4a -s ours
am skip reason: Change-Id I068c631a22c848e45a421b297b1acae1b3deb3c1 with SHA-1 6c5f82642b is in history

Change-Id: I0ddcd89091161631b4418dfe01086d895bb10d36
2020-05-07 22:02:06 +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
bc141e0071 Merge "libfiemap: Remove brittle tests." into rvc-dev am: 7d50e96978
Change-Id: I5439b9eaae680b0f05fb76552063951480073c10
2020-05-07 19:45:09 +00:00
David Anderson
10088dbe4e Merge "fastboot: Fix snapshot-update merge behavior." into rvc-dev am: 4adbeb470f
Change-Id: I56da350eec80f0232d24c2f6d160b97b2e3c4087
2020-05-07 19:44:47 +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
TreeHugger Robot
061e079781 Merge "Using ABB for install-multi." into rvc-dev am: 67a2bebf74
Change-Id: I522b1f80e84d0f1123a29f38e1a088849b9659fb
2020-05-06 23:16:05 +00:00
TreeHugger Robot
67a2bebf74 Merge "Using ABB for install-multi." into rvc-dev 2020-05-06 23:00:02 +00:00