Commit graph

60699 commits

Author SHA1 Message Date
Treehugger Robot
d548a25eb9 Merge changes from topic "remove_default_prop" am: a782da9b3e am: 50a558fb4e
Change-Id: I684a66d1e21906af1caab58a79841caa98168c84
2020-05-15 02:52:01 +00:00
Jiyong Park
67c7244ae6 /vendor/default.prop is removed. am: 8569552ec2 am: cbdb311d35
Change-Id: Ia92951941f772bbc9fff259b040a86e3d9be9bf6
2020-05-15 02:51:58 +00:00
Treehugger Robot
50a558fb4e Merge changes from topic "remove_default_prop" am: a782da9b3e
Change-Id: Icdc97a1e365c0acdb5e320aa87d3bb9afda7c2a0
2020-05-15 02:35:03 +00:00
Jiyong Park
cbdb311d35 /vendor/default.prop is removed. am: 8569552ec2
Change-Id: I9dd205c5dfc0485f482f6240fc74c7fe43d4c8ec
2020-05-15 02:35:00 +00:00
Treehugger Robot
a782da9b3e Merge changes from topic "remove_default_prop"
* changes:
  Remove /system/etc/prop.default
  /vendor/default.prop is removed.
2020-05-15 02:12:49 +00:00
Yifan Hong
cc855c50c3 Merge changes from topic "snapshot_fuzz" am: fa8bf5be4e am: 930eb139b7
Change-Id: Ib6498c5e1aad0e8062d342e1931d89192051243b
2020-05-14 21:04:49 +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
11fc5ee64d Merge "init: failed to set sys.usb.controller" am: 7c1c167307 am: e22844007e
Change-Id: I94e371f15e3553480b78be15ef70c237583d722b
2020-05-14 19:31:34 +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
c068d0e0ef Remove /system/etc/prop.default
Contents that were in /system/etc/prop.default are now in
/system/build.prop.

The content is placed at the top of build.prop to keep the existing
order between the two files.

Caveat #1: /prop.default still remains for non-Treble devices.

Caveat #2: ReadFileSymbolicLink test was changed to read /system/bin/ps
because /prop.default is no longer guaranteed to exist.

Bug: 117892318
Test: TH passes
Test: inspect  /system/build.prop and check if it has contents from
the old /system/etc/prop.default file

Change-Id: I0d3f96c1656dfe02bfa0e801680f7fa887afd1d9
2020-05-14 16:19:33 +09: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
Christopher Ferris
26e8575b31 Merge "Add new LocalUpdatableMaps benchmarks." am: 5133bbfd34 am: d6831f57e5
Change-Id: I4c0aaa43dc2831f47531cb23d4683f40e2e810ed
2020-05-14 01:29:41 +00: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
5e09d0722e Merge "logd: enable LTO" am: 17e8605bcf am: 01ae2552ea
Change-Id: I240b2aaa0a013a7bf99c5c388c34cd734669700c
2020-05-13 21:16:44 +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
53b5b3a7f5 [automerger skipped] Merge "Make /data/apex/active world readable" am: ae6cab0406 am: 0936da291c -s ours
am skip reason: Change-Id I5278897413ca0e32aed9d1c7f82e48138bc51404 with SHA-1 71278019d1 is in history

Change-Id: I21b36ed68c9659215b3aaf8c2010ab28518aeb6a
2020-05-13 20:45:22 +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
ff90461417 Merge "fastbootd: copy AVB footer on boot image to end of block device" am: 37f45fcd3b am: 8ca3b7a553
Change-Id: Ie80a2ce7a298c7da8f9acc8c18cc7340e82ff584
2020-05-13 20:02:54 +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
dd2830dc9e Merge changes I5731d640,Ia874b57a am: 0b3f9567c5 am: 1dc6605a44
Change-Id: I9b8833d42b495aafe33bc0905a08d01c4196b690
2020-05-13 16:53:38 +00: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
Jooyung Han
d8ea6b40cd [automerger skipped] Set min_sdk_version to be part of mainline modules am: 7937f29be8 -s ours
am skip reason: Change-Id Ida890adfe6dfac79267fc0e18b63d2330266438c with SHA-1 7ea0d74bc8 is in history

Change-Id: I910fd7781b85f006b5c4f2087713a31844dfba47
2020-05-13 07:35:36 +00:00
Treehugger Robot
1c4902d3bf Merge "Make some fdevent member functions pure virtual." am: b6a6023bda am: dce1b6ebfa
Change-Id: I84a95074c03d28a487571168b7ad144eb9e65221
2020-05-13 04:09:51 +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
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
Jooyung Han
d6e8d0b68b Merge "Set min_sdk_version to be part of mainline modules" am: 63d363baea am: b7b6f92c21
Change-Id: Ied3bfc85b892e3eb3e69bc2ad498e0b9d74bd032
2020-05-13 01:28:00 +00:00
Treehugger Robot
dfbc5d3853 Merge "Add a few more trivial socket_spec.h tests." am: 53053dd1b1 am: 81c0b12c50
Change-Id: I9e87e70c8421f3cda7d432bd53f28893d28612ee
2020-05-13 01:27:55 +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
f08e9935b0 Merge "liblog: remove useless #define" am: 18da289fac am: 0de918bdbb
Change-Id: I26a2df24e9b251602b5720afc07297de2af71746
2020-05-12 20:23:04 +00:00
Treehugger Robot
0de918bdbb Merge "liblog: remove useless #define" am: 18da289fac
Change-Id: I8d7953533e64deb50b26362917944c4ebcf45a0d
2020-05-12 20:09:22 +00:00
Treehugger Robot
6a1cde910c Merge "logd: remove unnecessary static" am: a597f75045 am: a55b2e3f68
Change-Id: Id8fc5c48e9ca3a0f12864a1196922e9bb36278de
2020-05-12 20:01:25 +00:00