Commit graph

59955 commits

Author SHA1 Message Date
Treehugger Robot
03f371e32e Merge "macOS build fix: no off64_t on darwin." am: 63f2be8f56 am: a1c8b995fb
Change-Id: I8b3c80e110c4978e7d94cddd26d60d1371961ac7
2020-04-15 22:45:50 +00:00
Treehugger Robot
a1c8b995fb Merge "macOS build fix: no off64_t on darwin." am: 63f2be8f56
Change-Id: Id025b6c3f020840f980c66a8a4e22efbec219aaa
2020-04-15 22:33:33 +00:00
Treehugger Robot
63f2be8f56 Merge "macOS build fix: no off64_t on darwin." 2020-04-15 22:24:03 +00:00
Elliott Hughes
31484c4d88 Merge "[incfs] Stream the hash tree for incremental installation" into rvc-dev-plus-aosp 2020-04-15 20:47:41 +00:00
Treehugger Robot
d2819fc843 Merge "first_stage_init: add hook to exec a shell script" am: 00c2625fd1 am: 18ddd43a95
Change-Id: Ib9d46f1663f86a8fb7b5380e4903fd2b8b1e58ee
2020-04-15 20:33:35 +00:00
Treehugger Robot
18ddd43a95 Merge "first_stage_init: add hook to exec a shell script" am: 00c2625fd1
Change-Id: Ia56a483698341e66e9abddd75b808f8cc6dcb8ba
2020-04-15 20:11:19 +00:00
Treehugger Robot
00c2625fd1 Merge "first_stage_init: add hook to exec a shell script" 2020-04-15 19:56:56 +00:00
Treehugger Robot
6e680217f6 [automerger skipped] Merge "first_stage_init: increase serial console tries to 50" am: 0919f10fa2 am: 9d01f0e64f -s ours
am skip reason: Change-Id I161a4176b2c6cf7b0bc1eefe072ff38b894add5d with SHA-1 283128f26a is in history

Change-Id: Ia65a087aa85506b05dfe22e833df923b5c3ca47d
2020-04-15 19:16:13 +00:00
Treehugger Robot
9d01f0e64f Merge "first_stage_init: increase serial console tries to 50" am: 0919f10fa2
Change-Id: I7a529b7383e906afc4418a788a79691c407c52d8
2020-04-15 18:58:17 +00:00
Treehugger Robot
0919f10fa2 Merge "first_stage_init: increase serial console tries to 50" 2020-04-15 18:47:56 +00:00
Treehugger Robot
09fa233ae1 Merge "Remove host_supported from libadb_pairing_server." am: 0b708cba86 am: 61bd06d0fa
Change-Id: I8bca9c8176e9bf1bb05e22850033d69d2ca097d3
2020-04-15 18:11:49 +00:00
Steve Muckle
a4bf2cee04 first_stage_init: add hook to exec a shell script
If the first stage console is being used, attempt to run /first_stage.sh
immediately before the console is created.

Bug: 154126020
Change-Id: I8b7431e7b8219afea295b120d7ea91751804bda6
2020-04-15 10:59:30 -07:00
Will McVicker
c4793572f3 first_stage_init: increase serial console tries to 50
tl,dr;
Increase the attempts to 50 to reduce the chances of failing
to load the serial console. This will only happen if the cmdline
parameter "androidboot.first_stage_console=1" is enabled.

Details:
10 attempts only amounts to about 1 second of trying to open the serial
console. I tested booting an ACK GKI image 5x with 20 vendor modules and
found the serial console loaded on attempt 17 for all five boot
tests.

Bug: 153354917
Test: boot ACK image 5x and verify serial console comes up
Change-Id: I161a4176b2c6cf7b0bc1eefe072ff38b894add5d
Merged-In: I161a4176b2c6cf7b0bc1eefe072ff38b894add5d
2020-04-15 10:57:46 -07:00
Treehugger Robot
61bd06d0fa Merge "Remove host_supported from libadb_pairing_server." am: 0b708cba86
Change-Id: I041f1a0cee234c7f5e805806d5e1e86bf846a900
2020-04-15 17:39:17 +00:00
David Anderson
c97fc958ee Merge "fs_mgr: Fix executable path in clean_scratch_files." am: f3c8e3036c am: 9234a28dfc
Change-Id: If1cab5097bf18c2c34ae4e9c66a64749fac45cc5
2020-04-15 17:29:54 +00:00
Treehugger Robot
513bae7660 Merge "macOS build fix: don't build libadbconnection." am: 8b4ed5f6b6 am: 072e1d3ad4
Change-Id: I224a97c89bbc0f6e8db2ef7cd9eb709b3ee362ef
2020-04-15 17:26:08 +00:00
Treehugger Robot
0b708cba86 Merge "Remove host_supported from libadb_pairing_server." 2020-04-15 17:16:28 +00:00
Alex Buynytskyy
203006b72a [incfs] Stream the hash tree for incremental installation
Instead of sending the whole tree upfront use the same
streaming interface for it as for the data blocks

This improves installation speed by almost 200ms,
650-800ms -> 500-600ms

Bug: 153696423
Test: manual, adb install in various configurations

Change-Id: Ia83de2af54ca0b1969397514ea5d761719af9055
(cherry picked from commit e2e850f325)
Merged-In: Ia83de2af54ca0b1969397514ea5d761719af9055
2020-04-15 17:07:07 +00:00
David Anderson
9234a28dfc Merge "fs_mgr: Fix executable path in clean_scratch_files." am: f3c8e3036c
Change-Id: I6f38ecf61a27b59d119f8be8617dea3854e1592a
2020-04-15 17:06:19 +00:00
Treehugger Robot
072e1d3ad4 Merge "macOS build fix: don't build libadbconnection." am: 8b4ed5f6b6
Change-Id: Ic83be195729511f10c6ed63d847f9b5232fb6255
2020-04-15 17:02:56 +00:00
David Anderson
f3c8e3036c Merge "fs_mgr: Fix executable path in clean_scratch_files." 2020-04-15 16:35:31 +00:00
Joshua Duong
5e32d2f8de Remove host_supported from libadb_pairing_server.
To fix mac build error. Shouldn't be building this for the host.

Bug: N/A

Test: mma in system/core/adb on mac.
Change-Id: I8b86d265ef9b91eeaf7a4e5d6623a5399403ecaf
2020-04-15 06:53:38 +00:00
David Anderson
a441612fae fs_mgr: Fix executable path in clean_scratch_files.
Bug: 154071877
Test: no error log on startup
Change-Id: I84c627011992eed6952697e7260051006b1c10d0
2020-04-14 23:47:38 -07:00
Treehugger Robot
8b4ed5f6b6 Merge "macOS build fix: don't build libadbconnection." 2020-04-15 02:12:09 +00:00
Kenny Root
955ec4b334 Merge "Use <fqname> to avoid conflicts" am: 0a1670ab15 am: ce9d298d50
Change-Id: If9d396821e7a08a183cb13dbc88480311e867f2e
2020-04-15 01:23:11 +00:00
Kenny Root
ce9d298d50 Merge "Use <fqname> to avoid conflicts" am: 0a1670ab15
Change-Id: Ic7150d82c229d4aefbb219af52576cd51bb27bba
2020-04-15 01:03:25 +00:00
Kenny Root
0a1670ab15 Merge "Use <fqname> to avoid conflicts" 2020-04-15 00:44:49 +00:00
Elliott Hughes
729f58e0b7 macOS build fix: don't build libadbconnection.
Test: builds on mac
Change-Id: I91e3bf6b06f31edf542f8f8d6529787b0bf3a6ed
2020-04-14 16:33:16 -07:00
Nikita Ioffe
93ed446f28 Merge "Add RootTargetPreparer for CtsInitTestCases and CtsFsMgrTestCases" am: 9c898802ed am: 12b392389a
Change-Id: I6ed92b62d9392d0943f95b25f45846fc3043bef3
2020-04-14 22:34:15 +00:00
Elliott Hughes
7d9a7a3b6e macOS build fix: no off64_t on darwin.
Darwin has always had a 64-bit off_t, and never added an off64_t.

Test: builds on mac
Change-Id: I4b244dda94c67da76c9e0f47b333c2734f5a94af
2020-04-14 15:34:01 -07:00
Nikita Ioffe
12b392389a Merge "Add RootTargetPreparer for CtsInitTestCases and CtsFsMgrTestCases" am: 9c898802ed
Change-Id: Iac428d0b979e1d1889f42c2d8533d48e36f1ee00
2020-04-14 22:13:25 +00:00
Nikita Ioffe
9c898802ed Merge "Add RootTargetPreparer for CtsInitTestCases and CtsFsMgrTestCases" 2020-04-14 21:53:50 +00:00
Tianjie Xu
94a568639d Merge "Fix the boundary check when parsing sizes in zip64 extended field" am: 83208f0833 am: 7691418255
Change-Id: I0a89c680e14c801eff3fc78e0faffd8e8504bc4b
2020-04-14 21:47:02 +00:00
Kenny Root
15351dcf60 Use <fqname> to avoid conflicts
The newer way of specifying the interface is using <fqname> and it also
has the handy side-effect of not causing conflicts when we add the
strongbox implementation to devices.

Test: make # check $OUT for the correct manifest
Change-Id: If8333814723261c4f3de375861ee19a6d922d55f
2020-04-14 14:37:24 -07:00
Tianjie Xu
7691418255 Merge "Fix the boundary check when parsing sizes in zip64 extended field" am: 83208f0833
Change-Id: Id0d9f0f39528d8031ab6c79d49a8dea0447f20fe
2020-04-14 21:27:28 +00:00
Tianjie Xu
83208f0833 Merge "Fix the boundary check when parsing sizes in zip64 extended field" 2020-04-14 21:03:45 +00:00
Josh Gao
4ef94e208c [automerger skipped] Merge "Add missing static for macOS inline." into rvc-dev am: 3b8745edac -s ours
am skip reason: Change-Id I2353215c0a8a6154ce8b39ecde022b282f5c0cb9 with SHA-1 681338dfb6 is in history

Change-Id: I416e64bfa09c416b3ac948f79cd9bac9a8ed842e
2020-04-14 20:17:51 +00:00
Josh Gao
3b8745edac Merge "Add missing static for macOS inline." into rvc-dev 2020-04-14 19:39:20 +00:00
Tianjie
d9bc8fd639 Fix the boundary check when parsing sizes in zip64 extended field
We should check if the data to read resides within the boundary of
the extended field. Also check OOB when reading bytes from the
zipfile.

Bug: 153828925
Test: parse the poc with hwasan build
Change-Id: I54b58a287b9ae4ca0e5cc563086c1ed8051fb72a
2020-04-14 11:26:42 -07:00
Nikita Ioffe
f3504ec58d Add RootTargetPreparer for CtsInitTestCases and CtsFsMgrTestCases
Some of the test cases in CtsInitTestCases and CtsFsMgrTestCases require
root. This CL makes it possible to run such tests cases on userdebug
builds, which in turn means that they will be run on presubmit.

New option was implemented in
https://android-review.googlesource.com/c/platform/tools/tradefederation/+/1283834

Test: atest CtsInitTestCases
Test: atest CtsFsMgrTestCases
Change-Id: I3d29789ddd7ac549e40ac193c58d986670c49285
2020-04-14 18:57:07 +01:00
Jaegeuk Kim
31d9fc644a Merge "fstab: support f2fs compression" am: 8b8743462c am: ff643270e6
Change-Id: Ib98473694ea544d76a023651a5bb3cb4f9de4d4a
2020-04-14 16:09:24 +00:00
Tom Cherry
a3544923d2 Merge "liblog: remove operator overloads from log_msg" am: 92d34064e1 am: 7d8b9c46f9
Change-Id: I5b47658ff08fafe7b07b66e19cde9356fac33210
2020-04-14 16:09:14 +00:00
Jaegeuk Kim
ff643270e6 Merge "fstab: support f2fs compression" am: 8b8743462c
Change-Id: I8a640686eb0887a241ef3b03633a63db1535af37
2020-04-14 15:58:30 +00:00
Jaegeuk Kim
8b8743462c Merge "fstab: support f2fs compression" 2020-04-14 15:54:18 +00:00
Tom Cherry
7d8b9c46f9 Merge "liblog: remove operator overloads from log_msg" am: 92d34064e1
Change-Id: Ifb706ab391c8583785eafbd18bf960d1b8f1b1a5
2020-04-14 15:48:44 +00:00
Tom Cherry
92d34064e1 Merge "liblog: remove operator overloads from log_msg" 2020-04-14 15:32:32 +00:00
Nikita Ioffe
0541e1aa18 [automerger skipped] Fallback to hard reboot if userspace reboot hasn't started in time am: 6236af3d0c -s ours
am skip reason: Change-Id Id70710b46da798945ac5422ef7d69265911ea5ef with SHA-1 d05535485f is in history

Change-Id: I481d92b463125f9e0945d36635d0bf03b93b4f4d
2020-04-14 10:34:50 +00:00
Elliott Hughes
e2bd0f0f6d Add missing static for macOS inline.
Also switch to #pragma once and s/__inline__/inline/g for consistency.

There are a handful of inlines that are missing static, which seems like
a bug, but I've left those for now.

Bug: http://b/153328340
Test: treehugger
Change-Id: I2353215c0a8a6154ce8b39ecde022b282f5c0cb9
Merged-In: I2353215c0a8a6154ce8b39ecde022b282f5c0cb9
(cherry picked from commit 681338dfb6)
2020-04-13 17:17:31 -07:00
Nikita Ioffe
6236af3d0c Fallback to hard reboot if userspace reboot hasn't started in time
Similarly to other recovery mechanisms, timeout is controlled by a
read-only property that can be configured per-device.

Test: adb root
Test: adb shell setprop init.userspace_reboot.started.timeoutmillis 2
Test: adb reboot userspace
Bug: 152803929
Change-Id: Id70710b46da798945ac5422ef7d69265911ea5ef
Merged-In: Id70710b46da798945ac5422ef7d69265911ea5ef
(cherry picked from commit d05535485f)
2020-04-14 00:21:41 +01:00
Yifan Hong
1f67a79693 [automerger skipped] Merge "BatteryMonitor: report current_now in uA" into rvc-dev am: d4cc15499b -s ours
am skip reason: Change-Id I675be1ae645413b9494af4a5d49955aad5bd4f2e with SHA-1 e5bd5f914f is in history

Change-Id: I4c1750be1588e21da0d263be1448d627097d7783
2020-04-13 22:51:34 +00:00