Commit Graph

59933 Commits

Author SHA1 Message Date
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 072e1d3ad4 Merge "macOS build fix: don't build libadbconnection." am: 8b4ed5f6b6
Change-Id: Ic83be195729511f10c6ed63d847f9b5232fb6255
2020-04-15 17:02:56 +00: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
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
Yifan Hong d4cc15499b Merge "BatteryMonitor: report current_now in uA" into rvc-dev 2020-04-13 22:31:12 +00:00
Treehugger Robot 65318a73b1 [automerger skipped] Merge "[incfs] Stream the hash tree for incremental installation" am: 451197cb64 am: 867ab77957 -s ours
am skip reason: Change-Id Ia83de2af54ca0b1969397514ea5d761719af9055 with SHA-1 e2e850f325 is in history

Change-Id: Id567be13bd73e816322cf68aea91e00b6c587543
2020-04-13 21:20:54 +00:00
Yurii Zubrytskyi 5b9ab217c4 [automerger skipped] [zip] Stop calculating crc if it's not checked am: 8ee7b1191a -s ours
am skip reason: Change-Id I917abecab01301f1d09a5bf3b542d24b3875e359 with SHA-1 8d8f637ee5 is in history

Change-Id: I42cdb22c9d67e523d9d1ed3c9314a3726e780983
2020-04-13 21:12:21 +00:00
Treehugger Robot 867ab77957 Merge "[incfs] Stream the hash tree for incremental installation" am: 451197cb64
Change-Id: Ifda4e7459cea27035414b85836e3cc7951e3d94c
2020-04-13 21:03:29 +00:00
Tom Cherry 0ca9bd2bcd liblog: remove operator overloads from log_msg
No one's using them and it's not intuitive how they would be used.

Test: build
Change-Id: I8d49825be2e7ecee9834060260b1c59c30664f1d
2020-04-13 13:48:58 -07:00
Treehugger Robot 451197cb64 Merge "[incfs] Stream the hash tree for incremental installation" 2020-04-13 20:37:27 +00:00
Alex Buynytskyy 82c1c9711d [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
Merged-In: Ia83de2af54ca0b1969397514ea5d761719af9055
2020-04-13 13:00:01 -07:00
Nikita Ioffe 6adc3f37df Merge "Fallback to hard reboot if userspace reboot hasn't started in time" am: 1c14654732 am: c9b97ed2e1
Change-Id: I795e603c4a6ee6ae076e9146df38176cd22d7123
2020-04-13 19:56:19 +00:00
Yurii Zubrytskyi c528882090 [automerger skipped] Merge "[incfs] Stream the hash tree for incremental installation" into rvc-dev am: c13fd3149d -s ours
am skip reason: skipped by user zyy

Change-Id: I4363f385d1813908215bfaf3471a955d39c35e6f
2020-04-13 19:48:08 +00:00
Nikita Ioffe c9b97ed2e1 Merge "Fallback to hard reboot if userspace reboot hasn't started in time" am: 1c14654732
Change-Id: I40298fca596791eef46ab810dd4f49e283dd9e4b
2020-04-13 19:36:37 +00:00
Nikita Ioffe 1c14654732 Merge "Fallback to hard reboot if userspace reboot hasn't started in time" 2020-04-13 19:14:56 +00:00
Yurii Zubrytskyi 8ee7b1191a [zip] Stop calculating crc if it's not checked
Crc calculation shows up in the profiler in 2-5% range, and is
never currently validated. Let's disable it for good.
For a well-compressible test data the difference is even nicer:

Benchmark                       Time          CPU        Iteration
------------------------------------------------------------------
ziparchive-benchmarks:
before:
  #ExtractEntry/2            1943244 ns    1926758 ns          375
  #ExtractEntry/16           1877295 ns    1867049 ns          375
  #ExtractEntry/1024         1888772 ns    1879976 ns          373
after:
  #ExtractEntry/2             817003 ns     812870 ns          874
  #ExtractEntry/16            814029 ns     809813 ns          875
  #ExtractEntry/1024          804904 ns     800972 ns          879

Bug: 153392568
Test: atest, manual
Change-Id: I917abecab01301f1d09a5bf3b542d24b3875e359
Merged-In: I917abecab01301f1d09a5bf3b542d24b3875e359
2020-04-13 19:09:44 +00:00
Yurii Zubrytskyi c13fd3149d Merge "[incfs] Stream the hash tree for incremental installation" into rvc-dev 2020-04-13 19:08:15 +00:00
Tom Cherry eeece2235a [automerger skipped] liblog: support extended logger_entry headers am: 57c8eacee4 -s ours
am skip reason: Change-Id I14b2b0855d219d11f374b53a5aa8e05cd6a65eef with SHA-1 d3ecc66b9c is in history

Change-Id: If720c86558664a17e7cb29ed772781729aac6eae
2020-04-13 17:31:53 +00:00
Tom Cherry 97a59d978a Merge "Cleanup some trivial TODOs." am: ffe39ea541 am: 4651144500
Change-Id: I1dd7541bfe60e52643b503a19196757af2c9dfe3
2020-04-13 16:20:02 +00:00
Tom Cherry 4651144500 Merge "Cleanup some trivial TODOs." am: ffe39ea541
Change-Id: I618a553459577a3eb8ba3c4d5bcd8f4015cc4644
2020-04-13 16:01:19 +00:00
Tom Cherry ffe39ea541 Merge "Cleanup some trivial TODOs." 2020-04-13 15:39:49 +00:00
Tom Cherry 54e43304ec Merge "liblog: cleanup TODOs in tests" am: ac0cee539f am: 0bcf8f86ce
Change-Id: Iabdb6fc3c80789aa221eb35563ee3767f9409120
2020-04-11 01:00:16 +00:00
Nikita Ioffe d05535485f 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
2020-04-11 01:59:17 +01:00
Tom Cherry 0bcf8f86ce Merge "liblog: cleanup TODOs in tests" am: ac0cee539f
Change-Id: I07580080153eaa59b023c73a2162a3f2ebb3c162
2020-04-11 00:41:32 +00:00
Tom Cherry ac0cee539f Merge "liblog: cleanup TODOs in tests" 2020-04-11 00:18:57 +00:00
Josh Gao 4765819326 Merge "debuggerd: don't leave a zombie child if crash_dump is killed." am: 44b7cb92d6 am: 5a12472be9
Change-Id: I6fc91beaab7ea4fc7a582b6d580f0a076d510127
2020-04-10 22:57:40 +00:00