Commit graph

58106 commits

Author SHA1 Message Date
Jiyong Park
cbdb311d35 /vendor/default.prop is removed. am: 8569552ec2
Change-Id: I9dd205c5dfc0485f482f6240fc74c7fe43d4c8ec
2020-05-15 02:35:00 +00:00
Yifan Hong
930eb139b7 Merge changes from topic "snapshot_fuzz" am: fa8bf5be4e
Change-Id: I2f6758bd5878edc26a428a48ce16193a637dba60
2020-05-14 20:51:28 +00:00
Yifan Hong
fa8bf5be4e Merge changes from topic "snapshot_fuzz"
* changes:
  libsnapshot_fuzzer: Add tests
  libsnapshot_fuzzer: add initial corpus
  libsnapshot_fuzzer: Attempt to cleanup env before and after
  libsnapshot_fuzzer: add new test directive to switch slot
  libsnapshot_fuzzer: mount data image
  libsnapshot_fuzzer: also create snapshots dir
  libsnapshot_fuzzer: Add ZERO to operation types
2020-05-14 20:41:08 +00:00
Treehugger Robot
e22844007e Merge "init: failed to set sys.usb.controller" am: 7c1c167307
Change-Id: Ic07e38c5bd3dac7404ec4ae742dcafb15c835769
2020-05-14 19:17:17 +00:00
Treehugger Robot
7c1c167307 Merge "init: failed to set sys.usb.controller" 2020-05-14 18:57:31 +00:00
Jiyong Park
8569552ec2 /vendor/default.prop is removed.
It is merged to /vendor/build.prop. However, for backwards
compatibility, the old file is read on devices running R or earlier.

Bug: 117892318
Test: TH passes
Test: inspect  /vendor/build.prop and check if it has contents from
the old /vendor/default.prop file
Change-Id: I994cc85fc0765bc9233e9799bcb670a23180f068
2020-05-14 16:19:32 +09:00
Mark Salyzyn
150687b87d init: failed to set sys.usb.controller
With GKI we find in certain situations the timing of the drivers
loading is delayed as compared to a monolithic kernel.  This
introduces a race where during second stage init, the attributes
inside /sys/class/udc/ might not be set by the time
SetUsbController() is called.

To address this, we also call SetUsbController() until the property
sys.usb.controller is set at the bottom of the event loop.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 151950334
Test: make sure user space fastbootd comes up reliably for a GKI kernel
Change-Id: Iececd8ffa3e6641554d215d622d8dab72d85d34d
2020-05-13 17:56:31 -07:00
Christopher Ferris
d6831f57e5 Merge "Add new LocalUpdatableMaps benchmarks." am: 5133bbfd34
Change-Id: I712f9c4ce5cfd0f4693e9645f1a9f935f11725ea
2020-05-14 00:41:39 +00:00
Christopher Ferris
5133bbfd34 Merge "Add new LocalUpdatableMaps benchmarks." 2020-05-14 00:18:27 +00:00
Tom Cherry
01ae2552ea Merge "logd: enable LTO" am: 17e8605bcf
Change-Id: Iec29c3588b0dffe1973bd2841ae8724dc95b866b
2020-05-13 21:03:48 +00:00
Tom Cherry
17e8605bcf Merge "logd: enable LTO" 2020-05-13 20:51:57 +00:00
Nikita Ioffe
0936da291c Merge "Make /data/apex/active world readable" am: ae6cab0406
Change-Id: I52ddb243530a894ebcf3cdceb47dd6a475158ff6
2020-05-13 20:32:25 +00:00
Nikita Ioffe
ae6cab0406 Merge "Make /data/apex/active world readable" 2020-05-13 20:15:12 +00:00
Treehugger Robot
8ca3b7a553 Merge "fastbootd: copy AVB footer on boot image to end of block device" am: 37f45fcd3b
Change-Id: Ifdfb3952d557f8c836eb39c960ae879ec94a76ce
2020-05-13 19:47:10 +00:00
Treehugger Robot
37f45fcd3b Merge "fastbootd: copy AVB footer on boot image to end of block device" 2020-05-13 19:38:03 +00:00
Tom Cherry
72f1aa8bf2 logd: enable LTO
Logd is self contained so LTO should be net beneficial.

Bug: 155322981
Test: logging unit tests
Change-Id: I7e26fcf15a7886ed537685d921428c679d7390f8
2020-05-13 11:04:02 -07:00
Tom Cherry
1dc6605a44 Merge changes I5731d640,Ia874b57a am: 0b3f9567c5
Change-Id: I6c8da8d8edf28440d8c6a4f737978e3757518b5c
2020-05-13 16:23:43 +00:00
Tom Cherry
0b3f9567c5 Merge changes I5731d640,Ia874b57a
* changes:
  logd: make LogBuffer an interface
  logd: refactor LastLogTimes a bit
2020-05-13 16:08:44 +00:00
Treehugger Robot
dce1b6ebfa Merge "Make some fdevent member functions pure virtual." am: b6a6023bda
Change-Id: I004aea068c5f36f0033d6633ca33122c1a09c7a2
2020-05-13 03:47:04 +00:00
Treehugger Robot
b6a6023bda Merge "Make some fdevent member functions pure virtual." 2020-05-13 03:31:03 +00:00
Jooyung Han
b7b6f92c21 Merge "Set min_sdk_version to be part of mainline modules" am: 63d363baea
Change-Id: Ic3f6573ca78b6a309cced0179ff58e329cc43ca5
2020-05-13 01:15:29 +00:00
Treehugger Robot
81c0b12c50 Merge "Add a few more trivial socket_spec.h tests." am: 53053dd1b1
Change-Id: Ic8d57b15117cb6dee1085dc4a43b15f120cd5dd5
2020-05-13 01:15:19 +00:00
Jooyung Han
63d363baea Merge "Set min_sdk_version to be part of mainline modules" 2020-05-13 01:06:30 +00:00
Treehugger Robot
53053dd1b1 Merge "Add a few more trivial socket_spec.h tests." 2020-05-13 01:00:39 +00:00
Elliott Hughes
e65e002102 Add a few more trivial socket_spec.h tests.
Also remove some dead code. The "missing port" case in
parse_tcp_socket_spec hasn't been meaningful since we put the default
port back.

Test: treehugger
Change-Id: I40958f0f1c2dd7f0315142c2c0363a70fe6f80fe
2020-05-12 16:38:11 -07:00
Steve Muckle
a9b3443e53 fastbootd: copy AVB footer on boot image to end of block device
If the flashed boot image is smaller than the block device, the AVB
footer will not be at the end of the partition. Although images are
normally created to match the partition size the GKI boot.img must work
on all devices, and the size of the boot partition will vary.

Copy the AVB footer to the end of the partition before flashing, if it
is not there already.

Bug: 156036850
Change-Id: I11f0c7d32d1b6c74edd4f84f815d175605280cb8
2020-05-12 16:21:41 -07:00
Elliott Hughes
631fe1e6df Make some fdevent member functions pure virtual.
...because that makes our coverage numbers look better. But since there
are only two concrete classes anyway, we weren't gaining much from the
default implementation and it's arguably more intention-revealing now.

Test: treehugger
Change-Id: I7a8a3195023048b1a84277358b857222692d96ee
2020-05-12 16:18:52 -07:00
Jooyung Han
7ea0d74bc8 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
Change-Id: Ida890adfe6dfac79267fc0e18b63d2330266438c
2020-05-13 08:18:06 +09:00
Tom Cherry
d5b3838dbc logd: make LogBuffer an interface
We may use different implementations of LogBuffer in the future, so we
make it interface and create a concrete ChattyLogBuffer class that
implements it.

Test: logging unit tests
Change-Id: I5731d6404640664c9acc26b7c677dff3110c6a11
2020-05-12 15:39:19 -07:00
Tom Cherry
68630a0dbe logd: refactor LastLogTimes a bit
There's still plenty of work that can be done here, particularly
re-doing the locking so each LogReaderThread does not mutually exclude
the others, but that's out of the scope here.

This change primarily removes the public 'mTimes' from LogBuffer and
creates a new LogReaderList class instead.  It would have merged this
into LogReader, but that creates a circular dependency.

This change also removes the need to reference LogReader or
LogReaderList from LogAudit, LogKLog, and LogListener, instead relying
on LogBuffer()::log() to call LogReaderList::NotifyNewLog().

Test: logging unit tests
Change-Id: Ia874b57a9ec1254af1295bfa6f7af2f92a75755b
2020-05-12 15:39:11 -07:00
Treehugger Robot
0de918bdbb Merge "liblog: remove useless #define" am: 18da289fac
Change-Id: I8d7953533e64deb50b26362917944c4ebcf45a0d
2020-05-12 20:09:22 +00:00
Treehugger Robot
18da289fac Merge "liblog: remove useless #define" 2020-05-12 19:49:26 +00:00
Treehugger Robot
a55b2e3f68 Merge "logd: remove unnecessary static" am: a597f75045
Change-Id: I255b0a524af3c29f88c6de1891b51feb5fbdba12
2020-05-12 19:44:41 +00:00
Treehugger Robot
a597f75045 Merge "logd: remove unnecessary static" 2020-05-12 19:28:52 +00:00
Tom Cherry
6a391e9eda liblog: remove useless #define
Neither android_logger_free nor android_logger_close exist.

Test: build
Change-Id: Ieb4d740c234b54db9278a21f07b0533c28b76baf
2020-05-12 10:44:22 -07:00
Tom Cherry
40addf79d4 logd: remove unnecessary static
ThreadFunction() will only be entered once, so there's no worry that
we'll call prctl() multiple times.

Test: logging unit tests
Change-Id: Id2a02c2ab807f1565e3d625424e040481b3aa1a3
2020-05-12 10:42:25 -07:00
Tom Cherry
0379e27671 Merge changes I9d6dde2c,I38bfcba5 am: a269c7c3d1
Change-Id: I7b1d8555bab125ee5b0d2320917e16764c271537
2020-05-12 16:09:13 +00:00
Tom Cherry
a269c7c3d1 Merge changes I9d6dde2c,I38bfcba5
* changes:
  logd: separate LogStatistics from LogBuffer
  logd: remove LogFindWorst
2020-05-12 15:55:50 +00:00
Josh Gao
5954016965 Merge changes Id8d9fa6c,I47d3ad50,I7cebbf75,Id10e320a am: a227c19ef2
Change-Id: I9768dedeb7e2bd4f44c872bbaa6695a9fa8e794d
2020-05-12 05:44:01 +00:00
Josh Gao
a227c19ef2 Merge changes Id8d9fa6c,I47d3ad50,I7cebbf75,Id10e320a
* changes:
  adbd: avoid compiling more code in the daemon.
  adb: don't run all of the tests again over TCP in coverage.
  adbd: respect ADB_TRACE on host adbd.
  adb: mark kMaxProcessNameLength as constexpr.
2020-05-12 05:32:48 +00:00
Treehugger Robot
e555230b01 Merge changes I24e70952,I652560ad am: 8987016b1e
Change-Id: I8f5b9f40a41c9124dd14ac80178584a475330590
2020-05-12 02:37:27 +00:00
Treehugger Robot
8987016b1e Merge changes I24e70952,I652560ad
* changes:
  adb: use transport-id to make coverage script faster.
  adb: add `adb transport-id` command.
2020-05-12 02:22:27 +00:00
Tom Cherry
de2a239467 Merge "logd: don't poll() before recvmsg()" am: bf3b47a031
Change-Id: I35b3a5e581163838d3154100c38719547a4fa7b2
2020-05-12 00:49:25 +00:00
Tom Cherry
bf3b47a031 Merge "logd: don't poll() before recvmsg()" 2020-05-12 00:31:37 +00:00
Treehugger Robot
15a669542e Merge "Remove unneeded optimize_for lite" am: 1d77251d76
Change-Id: Ic831678603d567bba7c7b59954f268acb16f07e7
2020-05-11 23:59:43 +00:00
Treehugger Robot
1d77251d76 Merge "Remove unneeded optimize_for lite" 2020-05-11 23:49:29 +00:00
Yifan Hong
1e6ff23b6e Merge "vts_processgroup_validate_test: make deps static" am: d6b307fb15
Change-Id: Ibd82e15de71d3e94ca708e48b0c4fd1bf5f79ecc
2020-05-11 19:39:32 +00:00
Yifan Hong
d6b307fb15 Merge "vts_processgroup_validate_test: make deps static" 2020-05-11 19:29:39 +00:00
Lorenzo Colitti
6d152b752c Merge "Simplify code that parses ifa_flags." am: cc39283883
Change-Id: I1b09a1d55de89bc3324c455adb23978be288b12e
2020-05-11 15:43:32 +00:00
Lorenzo Colitti
cc39283883 Merge "Simplify code that parses ifa_flags." 2020-05-11 15:34:10 +00:00