Commit graph

57669 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
5a12472be9 Merge "debuggerd: don't leave a zombie child if crash_dump is killed." am: 44b7cb92d6
Change-Id: I7fbd5c88391d20efc0f0aa6e8e1094392620cc89
2020-04-10 22:31:06 +00:00
Josh Gao
44b7cb92d6 Merge "debuggerd: don't leave a zombie child if crash_dump is killed." 2020-04-10 22:04:03 +00:00
Tom Cherry
21c0b208c9 Merge "Revert "logd: iterator corruption paranoia"" am: acf0bebcf9
Change-Id: I69220b7ea5e2ccf36937cd1e8e4c57fb117769ad
2020-04-10 21:15:31 +00:00
Tom Cherry
acf0bebcf9 Merge "Revert "logd: iterator corruption paranoia"" 2020-04-10 20:53:59 +00:00
Tom Cherry
5f4c79f510 liblog: cleanup TODOs in tests
1) log_msg.msg() will never be nullptr, unless logd sends an invalid
   response, so it's the right idea to ASSERT() that this is true
   instead of just checking and continuing.
2) Even though liblog.too_big_payload is tautological, there's no
   reason not to test it, in case the assumptions that make it
   tautological change.
3) We're not too worried about the return value of logging functions
   or that liblog prevents them from being written (anyone can write
   their own values to logd after all).

Test: liblog-unit-tests
Change-Id: I144cc7cf45c164ea5f04e0786ff0e298fd626f07
2020-04-10 13:48:05 -07:00
Tom Cherry
98df2743d9 Merge "init: fix todo in a test" am: 5d93b127f5
Change-Id: Ibe3211c4ca2025806412555417c51b6ccb7ea6df
2020-04-10 20:17:12 +00:00
Tom Cherry
5d93b127f5 Merge "init: fix todo in a test" 2020-04-10 19:56:04 +00:00
Josh Gao
257c5ef607 Merge "[adb] Don't copy features set on each get()" am: 8489bfb4d7
Change-Id: Ic3b6d91144de2fe3c7ed7077e547b558e9a74328
2020-04-10 18:55:49 +00:00
Josh Gao
8489bfb4d7 Merge "[adb] Don't copy features set on each get()" 2020-04-10 18:18:15 +00:00
Tom Cherry
85f2bc930a Cleanup some trivial TODOs.
1) There's no reason or way to support boot_clock for waiting for
   property changes, since the underlying futex_wait uses
   CLOCK_MONOTONIC.  We probably wouldn't want boot_clock even if it
   did, since it doesn't make sense to consider the time a device was
   suspending in the timeout for waiting for a property to change.
2) The init tokenizer has been essentially unchanged for a decade,
   there's no motivation to 'fix' it to not require a trailing
   newline.
3) The ueventd TODO regarding moving vendor specific ueventd.rc
   entries out of rootdir has been fixed.

Test: n/a
Change-Id: I3b68e3d2f25cbd539f9f8ff526669b8af04d833d
2020-04-10 10:15:30 -07:00
Josh Gao
c40a7515eb debuggerd: don't leave a zombie child if crash_dump is killed.
If crash_dump dies before it gets a chance to write to the pipe we use
to let the debugged-process know that it successfully started, we
weren't cleaning up the child we fork to start it, leaving a zombie
child.

Bug: http://b/152119184
Test: debuggerd_test
Change-Id: Id01cc05f693995e9998941774f74ab8e3d8b4d8a
2020-04-10 10:09:39 -07:00
Tom Cherry
3f67fb8e45 init: fix todo in a test
Structured bindings with templated containers work now, so no need for
the workaround or TODO.

Test: init unit tests
Change-Id: I6a286de9859d8a97df480a7ac2862a3a10bd9fb3
2020-04-10 10:08:24 -07:00
Tom Cherry
ad7d6b210d Revert "logd: iterator corruption paranoia"
This reverts commit 3614a0c5d4.

The original commit was added to check if what should be impossible
cases were happening.  In the years after it was added, it doesn't
appear that these cases have happened.  Recent reverts removed the
commits that caused the paranoia in the first place, making these
cases even more impossible.

Test: logging unit tests
Change-Id: I687c4d7876a38485e940f004dbd5ae6a1e15fb4c
2020-04-10 09:38:51 -07:00
Tom Cherry
d744ad5479 Merge "liblog: support extended logger_entry headers" am: 7ef143fc84
Change-Id: Iaee7bd2414ed929e1daf7fc5c15918b20ff2acc3
2020-04-10 15:41:16 +00:00
Tom Cherry
7ef143fc84 Merge "liblog: support extended logger_entry headers" 2020-04-10 15:18:03 +00:00
Yurii Zubrytskyi
6339113704 Merge "[zip] Stop calculating crc if it's not checked" am: 83c7ad22a1
Change-Id: I969818306086143fc1cb2c12175558b3b58b2354
2020-04-10 05:31:06 +00:00
Yurii Zubrytskyi
6fc26dff7c [adb] Don't copy features set on each get()
The features are already cached in a static and don't change.
Let's return the cached set instead of copying it every time.

Bug: 150183149
Test: manual
Change-Id: Ifdca852cc3b32e09e50ea4771f7878987c46cce8
2020-04-09 22:26:48 -07:00
Yurii Zubrytskyi
83c7ad22a1 Merge "[zip] Stop calculating crc if it's not checked" 2020-04-10 05:07:30 +00:00
TreeHugger Robot
8d2db9f8d3 Merge "DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master" into stage-aosp-master 2020-04-10 03:03:20 +00:00
Jiyong Park
d95ae9b3ac Merge changes I8fd2a3c9,Id08058f3 am: 49c52979ba
Change-Id: Iff9e33fcb05ac9365e7db95577ba2d1c891ba89b
2020-04-10 01:29:14 +00:00
Jiyong Park
49c52979ba Merge changes I8fd2a3c9,Id08058f3
* changes:
  Set apex_available property
  Set apex_available property
2020-04-10 01:14:55 +00:00
Xin Li
60d3db1163 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master
Bug: 151763422
Change-Id: Iad12e5e7410a59ee7a3ee29c5b995ab6a1af2786
2020-04-09 17:51:26 -07:00
Tom Cherry
d3ecc66b9c liblog: support extended logger_entry headers
logger_entry has a hdr_size field meant for backwards compatibility,
however there are a few checks that expect it to be a specific size.
More problematically, it has a variable length array element, msg[0]
at the end, that would be incorrect if the header size was not kept
static.

This change fixes up those issues to facilitate future additions.

Bug: 119867234
Test: logging works with extended size headers, logging unit tests
Test: newly added unit tests with extended size header
Change-Id: I14b2b0855d219d11f374b53a5aa8e05cd6a65eef
2020-04-09 15:48:44 -07:00
Steven Moreland
3e773903f1 Merge "Note selinux trans error happens in permissive." am: 90540ad53a
Change-Id: Ic65240b0aa41e76b694453b8617f5678dd29cf7a
2020-04-09 22:10:40 +00:00
Yifan Hong
9821156b1e Merge "BatteryMonitor: report current_now in uA" am: 559270448d
Change-Id: I105b2ae709c0b88d5bf07621b2faaff191c6c671
2020-04-09 22:10:33 +00:00
Steven Moreland
90540ad53a Merge "Note selinux trans error happens in permissive." 2020-04-09 21:52:08 +00:00