Commit graph

63259 commits

Author SHA1 Message Date
Treehugger Robot
46cfe7dbeb Merge "Passing additional flags to incremental installation." am: f947d50395 am: 7a98a642fd am: 4e901d430f am: 0014af6d31
Change-Id: Ib3035276ad4d51cb093c0f393d79fc7184e4cc05
2020-05-15 06:51:42 +00:00
Treehugger Robot
0014af6d31 Merge "Passing additional flags to incremental installation." am: f947d50395 am: 7a98a642fd am: 4e901d430f
Change-Id: I5fb7bd127e7dc9d04fea8f33a8a44c19896ed5f2
2020-05-15 06:39:58 +00:00
Treehugger Robot
4e901d430f Merge "Passing additional flags to incremental installation." am: f947d50395 am: 7a98a642fd
Change-Id: Icc37b29af0f9a84c740ec115d3fc4334725fc19d
2020-05-15 06:27:16 +00:00
Treehugger Robot
7a98a642fd Merge "Passing additional flags to incremental installation." am: f947d50395
Change-Id: I0d4bdaabfa252bba51e9df6ce56b65909a445197
2020-05-15 06:06:46 +00:00
Treehugger Robot
f947d50395 Merge "Passing additional flags to incremental installation." 2020-05-15 05:53:14 +00:00
Treehugger Robot
dc2cfec519 Merge "Temporarily disable init_kill_services_test." am: e31d8bf133 am: 2a5c09dbfe am: 33a3b97a67 am: c684a9165c
Change-Id: I47e5c085be12cdfb252f0e7d71f964190e7bc8c4
2020-05-15 03:23:08 +00:00
Treehugger Robot
33cd37eaec Merge changes from topic "remove_default_prop" am: a782da9b3e am: 50a558fb4e am: d548a25eb9 am: 7a93c8f037
Change-Id: I4b026825d69a0c68911f790e7763b13cc944827d
2020-05-15 03:22:54 +00:00
Jiyong Park
8816ed0766 /vendor/default.prop is removed. am: 8569552ec2 am: cbdb311d35 am: 67c7244ae6 am: 419180a768
Change-Id: Ie089417832d004fef31cf1efdf6347cda2a604c0
2020-05-15 03:22:52 +00:00
Treehugger Robot
c684a9165c Merge "Temporarily disable init_kill_services_test." am: e31d8bf133 am: 2a5c09dbfe am: 33a3b97a67
Change-Id: If8f9903254d0cd56bcd0550ab413c30bcdc13fbc
2020-05-15 03:11:35 +00:00
Treehugger Robot
7a93c8f037 Merge changes from topic "remove_default_prop" am: a782da9b3e am: 50a558fb4e am: d548a25eb9
Change-Id: I8a97afab84a338d4c26534512c21dab8614b93e2
2020-05-15 03:11:15 +00:00
Jiyong Park
419180a768 /vendor/default.prop is removed. am: 8569552ec2 am: cbdb311d35 am: 67c7244ae6
Change-Id: Ie4902bb17619e6c98b5fa7852898d19803bbdefa
2020-05-15 03:11:13 +00:00
Treehugger Robot
33a3b97a67 Merge "Temporarily disable init_kill_services_test." am: e31d8bf133 am: 2a5c09dbfe
Change-Id: I9f2985f9eeb602b82e19241f6cb306f974e34b68
2020-05-15 02:52:09 +00:00
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
2a5c09dbfe Merge "Temporarily disable init_kill_services_test." am: e31d8bf133
Change-Id: Iec949ad9336738d8d9e062b0d816da0a567fa63c
2020-05-15 02:36:02 +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
e31d8bf133 Merge "Temporarily disable init_kill_services_test." 2020-05-15 02:34:43 +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
3686a66adc Merge changes from topic "snapshot_fuzz" am: fa8bf5be4e am: 930eb139b7 am: cc855c50c3 am: 602f8d5496
Change-Id: Ifdc22b2f76dc597593451c52af453f3468ce78ae
2020-05-14 21:55:53 +00:00
Yifan Hong
602f8d5496 Merge changes from topic "snapshot_fuzz" am: fa8bf5be4e am: 930eb139b7 am: cc855c50c3
Change-Id: Idbdc62bee50b27df3bb65a644373a4af6d31b91a
2020-05-14 21:38:50 +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
Alex Buynytskyy
04aa5bedcc Passing additional flags to incremental installation.
Bug: 150803885
Test: atest adb_test adbd_test fastdeploy_test
Change-Id: Ifa9b9e570259d35eb0121817bbb791044c6efcfd
2020-05-14 13:58:47 -07: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
aedb8fdd35 Merge "init: failed to set sys.usb.controller" am: 7c1c167307 am: e22844007e am: 11fc5ee64d am: 1ec5cffd71
Change-Id: I2a85ebecab1ffec96a4735ff8bf261e3a0deea21
2020-05-14 19:58:28 +00:00
Treehugger Robot
1ec5cffd71 Merge "init: failed to set sys.usb.controller" am: 7c1c167307 am: e22844007e am: 11fc5ee64d
Change-Id: Ie11d72a6c27a8c5f509fb36adc44ec67b4d8e0d6
2020-05-14 19:44:58 +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
Steven Moreland
bd68757d44 Temporarily disable init_kill_services_test.
This is causing some device instability.

Bug: 156380383
Test: n/A
Change-Id: I2ae34618db94df8fddab262311bd8e383642e10f
2020-05-14 16:58:33 +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
e83afafb8e Merge "Add new LocalUpdatableMaps benchmarks." am: 5133bbfd34 am: d6831f57e5 am: 26e8575b31 am: 9913d65cd7
Change-Id: Iacb38cdca7d6e4b6b51c7c3ade8d1c86a3beb116
2020-05-14 02:01:29 +00:00
Christopher Ferris
9913d65cd7 Merge "Add new LocalUpdatableMaps benchmarks." am: 5133bbfd34 am: d6831f57e5 am: 26e8575b31
Change-Id: Ica0d8e805e9bb702329bde4c122e97b2df5ca21e
2020-05-14 01:43:15 +00: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
f95b17448c Merge "logd: enable LTO" am: 17e8605bcf am: 01ae2552ea am: 5e09d0722e am: 6f039d13c1
Change-Id: I2199f22b508dd98f427a2aeb598d2dcd15b34aed
2020-05-13 21:50:50 +00:00
Tom Cherry
6f039d13c1 Merge "logd: enable LTO" am: 17e8605bcf am: 01ae2552ea am: 5e09d0722e
Change-Id: Ib5a67fe6885f91d01e656ff634ab57bcb578ceeb
2020-05-13 21:30:08 +00:00
Nikita Ioffe
74be09b5fb [automerger skipped] Merge "Make /data/apex/active world readable" am: ae6cab0406 am: 0936da291c -s ours am: 53b5b3a7f5 -s ours am: 6591403691 -s ours
am skip reason: Change-Id I5278897413ca0e32aed9d1c7f82e48138bc51404 with SHA-1 71278019d1 is in history

Change-Id: Ibedd5048e9711142db6c8601c57b810313780a8d
2020-05-13 21:22:22 +00:00
Tom Cherry
5e09d0722e Merge "logd: enable LTO" am: 17e8605bcf am: 01ae2552ea
Change-Id: I240b2aaa0a013a7bf99c5c388c34cd734669700c
2020-05-13 21:16:44 +00:00
Nikita Ioffe
6591403691 [automerger skipped] Merge "Make /data/apex/active world readable" am: ae6cab0406 am: 0936da291c -s ours am: 53b5b3a7f5 -s ours
am skip reason: Change-Id I5278897413ca0e32aed9d1c7f82e48138bc51404 with SHA-1 71278019d1 is in history

Change-Id: I3a930ecc52d482ce4b744649a177c4bea4a72f9e
2020-05-13 21:04:05 +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
Treehugger Robot
577e04abb1 Merge "fastbootd: copy AVB footer on boot image to end of block device" am: 37f45fcd3b am: 8ca3b7a553 am: ff90461417 am: 59d10a7d80
Change-Id: Ib11cdaf74feb24e6e9b3d810dccd6467c17560c8
2020-05-13 20:39:27 +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
Treehugger Robot
59d10a7d80 Merge "fastbootd: copy AVB footer on boot image to end of block device" am: 37f45fcd3b am: 8ca3b7a553 am: ff90461417
Change-Id: I7e6712846f8b47252dfc91ca6254d51e29228eab
2020-05-13 20:25:28 +00:00