Commit graph

59198 commits

Author SHA1 Message Date
Automerger Merge Worker
27bc48efa8 [automerger skipped] Merge "Revert "Fixed a typo in the version name"" am: 897444209c am: d5802a3ab6 -s ours
am skip reason: Change-Id I0e1e7da1cfbe320ba6605f8de9dcdb5091c41e4f with SHA-1 f52b19b50e is in history

Change-Id: I58729a9f7c1b7d53093dca685cb7c02d441893f3
2020-03-06 22:28:46 +00:00
Automerger Merge Worker
6fb1e20b40 [automerger skipped] Merge "Revert "Fixed a typo in the version name"" am: 897444209c am: d5802a3ab6 -s ours
am skip reason: Change-Id Icff3bd68b31f8c1d5a71f05c7c52eae6e896bfc2 with SHA-1 3439fd9537 is in history

Change-Id: If128790acd3e750b0442eda3b6bbd314b6010980
2020-03-06 22:28:45 +00:00
Automerger Merge Worker
d5802a3ab6 Merge "Revert "Fixed a typo in the version name"" am: 897444209c
Change-Id: I908cac5459e9bba81fbefe990f1acb5dc4c7d061
2020-03-06 22:15:37 +00:00
Luke Huang
7452e46ae0 Use libbase to get the elapsed time instead of libutils
To minimize the external library dependencies

Bug: 149721367
Test: atest
Change-Id: I7b79223ad58c2af94d01a35ad39be6cdd1de7f47
Merged-In: I7b79223ad58c2af94d01a35ad39be6cdd1de7f47
(cherry picked from commit cab9854fa9)
2020-03-06 22:09:44 +00:00
Ian Kasprzak
897444209c Merge "Revert "Fixed a typo in the version name"" 2020-03-06 21:57:57 +00:00
Shukang Zhou
f4ffae1055 "track-app" service showing debuggable/profileable apps
Add a "track-app" service in adbd. For every debuggable or
profileable-from-shell process, ART sends related info to
adbd and adbd surfaces the info through the "track-app"
service.

The output format of "track-app" is a line summarizing
the number of reported processes, followed by a protobuf
message in human readable form. For example,

Process count: 2
process {
  pid: 3307
  profileable: true
  architecture: "arm64"
}
process {
  pid: 3341
  debuggable: true
  profileable: true
  architecture: "arm64"
}

Bug: 149050485
Test: manually unplugged/replugged, "adb track-app",
      "adb track-jdwp"
Change-Id: Id1f1a920e1afc148c7e4d2add790baab796178e1
2020-03-06 13:56:27 -08:00
Automerger Merge Worker
525602c45c Merge "Move GetMountedEntryForUserdata to fs_mgr.h" into rvc-dev am: bbbd1a8e41
Change-Id: I7e16a12e06656526d40b21c500dc7e6f5f9b0ae2
2020-03-06 19:58:35 +00:00
Automerger Merge Worker
1cac1f5908 Merge "debuggerd: add an opt-out for OEMs that would rather collect core dumps." into rvc-dev am: 5f3afb215b
Change-Id: I2cca565855e6436a26bba674a4a24575870ef884
2020-03-06 19:58:27 +00:00
Nikita Ioffe
30b0c01dd8 Move GetMountedEntryForUserdata to fs_mgr.h
Logic of unwinding dm-device stack to figure out what entry was used to
mount userdata turned out to be a little bit more involved, and it
shouldn't be part of libfstab

This CL just moves code around and cleans API a little bit, actual fix
will be in the follow-up CL.

Test: atest CtsFsMgrTest
Test: atest CtsUserspaceRebootHostSideTestCases
Bug: 148612148
Change-Id: If0f8a765dba63adb0e6a711eb81fffdcabea3480
Merged-In: If0f8a765dba63adb0e6a711eb81fffdcabea3480
(cherry picked from commit 8f50cfc28d)
2020-03-06 19:50:10 +00:00
Nikita Ioffe
bbbd1a8e41 Merge "Move GetMountedEntryForUserdata to fs_mgr.h" into rvc-dev 2020-03-06 19:45:54 +00:00
TreeHugger Robot
5f3afb215b Merge "debuggerd: add an opt-out for OEMs that would rather collect core dumps." into rvc-dev 2020-03-06 19:42:41 +00:00
Ian Kasprzak
e6e87fd705 Revert "Fixed a typo in the version name"
This reverts commit eb94c7802d.

Reason for revert: b/150949964 - Broke boot test on aosp-master-with-phones.

Merged-In tags to revert just aosp-master/stage-aosp-master where boot
is broken.

Change-Id: Ic76e36b42060b5948f48af41f67544598d6f9f87
Merged-In: I0e1e7da1cfbe320ba6605f8de9dcdb5091c41e4f
Merged-In: Icff3bd68b31f8c1d5a71f05c7c52eae6e896bfc2
2020-03-06 19:38:13 +00:00
Nikita Ioffe
8f50cfc28d Move GetMountedEntryForUserdata to fs_mgr.h
Logic of unwinding dm-device stack to figure out what entry was used to
mount userdata turned out to be a little bit more involved, and it
shouldn't be part of libfstab

This CL just moves code around and cleans API a little bit, actual fix
will be in the follow-up CL.

Test: atest CtsFsMgrTest
Test: atest CtsUserspaceRebootHostSideTestCases
Bug: 148612148
Change-Id: If0f8a765dba63adb0e6a711eb81fffdcabea3480
2020-03-06 18:31:38 +00:00
Automerger Merge Worker
3439fd9537 Merge changes from topic "snapshot_rollback" into rvc-dev am: f9783dc18d
Change-Id: Icff3bd68b31f8c1d5a71f05c7c52eae6e896bfc2
2020-03-06 18:16:37 +00:00
Automerger Merge Worker
3b84e0c622 [automerger skipped] init: Make sure ImageManager status files are labelled. am: 960a81f4a1 -s ours
am skip reason: Change-Id I72949fca2889f9e5612049844a78bf9355b48797 with SHA-1 c991f347b2 is in history

Change-Id: I528a9d2c6f6cddf065aeb9e4a11dccfd2be54ffb
2020-03-06 18:16:35 +00:00
Yifan Hong
f9783dc18d Merge changes from topic "snapshot_rollback" into rvc-dev
* changes:
  init: restorecon libsnapshot rollback indicator
  init: Make sure ImageManager status files are labelled.
2020-03-06 18:01:06 +00:00
Automerger Merge Worker
c7b21340b1 Merge "debuggerd: add an opt-out for OEMs that would rather collect core dumps." am: 151e74894f am: 0f858f8e4d
Change-Id: I21958d130104728f7b5b3aced8a05e5f0b0e0fb7
2020-03-06 17:50:16 +00:00
Automerger Merge Worker
f52b19b50e Merge "debuggerd: add an opt-out for OEMs that would rather collect core dumps." am: 151e74894f am: 0f858f8e4d
Change-Id: I0e1e7da1cfbe320ba6605f8de9dcdb5091c41e4f
2020-03-06 17:50:15 +00:00
Automerger Merge Worker
0f858f8e4d Merge "debuggerd: add an opt-out for OEMs that would rather collect core dumps." am: 151e74894f
Change-Id: Id04d028d51c3a9b74886f7fc01cc0c213ffa16b9
2020-03-06 17:30:39 +00:00
Elliott Hughes
76eb935bd4 debuggerd: add an opt-out for OEMs that would rather collect core dumps.
On userdebug/eng devices, check a system property to see whether we
should create tombstones or not. OEMs that would rather have core dumps
can set this property and configure /proc/sys/kernel/core_pattern
appropriately.

Bug: https://issuetracker.google.com/149663286
Test: set the property, cause a crash
Change-Id: If894b4582a1820b64bdae819cec593b7710cb6e3
(cherry picked from commit 530ab81e42)
2020-03-06 09:21:45 -08:00
Elliott Hughes
151e74894f Merge "debuggerd: add an opt-out for OEMs that would rather collect core dumps." 2020-03-06 17:17:51 +00:00
Automerger Merge Worker
635db5f5f0 [automerger skipped] Add cpu-set properties to serializer test am: 6ea9b8b580 -s ours am: 88b85abc6a -s ours
am skip reason: Change-Id I1232fec5f1d0be7e5fb6aa5c46f6c2c5529bfc6c with SHA-1 8e77b789f8 is in history

Change-Id: I46b68db943b20c6beb0d55f7fd931f01f96704ba
2020-03-06 16:32:39 +00:00
Automerger Merge Worker
88b85abc6a [automerger skipped] Add cpu-set properties to serializer test am: 6ea9b8b580 -s ours
am skip reason: Change-Id I1232fec5f1d0be7e5fb6aa5c46f6c2c5529bfc6c with SHA-1 8e77b789f8 is in history

Change-Id: I0e13c779e06c07a648e4ac8ccbfeec437f4dbb7a
2020-03-06 16:19:26 +00:00
Automerger Merge Worker
10de70fb20 [automerger skipped] Merge "base: access all new liblog symbols through liblog_functions" into rvc-dev am: ae86eb783a -s ours
am skip reason: Change-Id I99615b81cfe9166a00c812a8642ecf1244bf08b9 with SHA-1 d620ec7fb9 is in history

Change-Id: Icb74554391e037133a0747d2c56bf9ac4213c587
2020-03-06 10:18:43 +00:00
Automerger Merge Worker
3979a004a8 [automerger skipped] Merge "Refine the exported DSU status" into rvc-dev am: 7fc6052fd3 -s ours
am skip reason: Change-Id I27fae316214498407a73474ca8b93aec3518e4b5 with SHA-1 2e1c6b26a1 is in history

Change-Id: I1650a7a15f7d53ca5d6a40c5cbfac7c794fc90a2
2020-03-06 10:18:30 +00:00
Automerger Merge Worker
4db318bd1a [automerger skipped] Merge changes from topic "snapshotctl_cleanup" into rvc-dev am: 133c060693 -s ours
am skip reason: Change-Id Ie4036ac7382102c00f0761f443d78e00b9e585d5 with SHA-1 97ebd91b0a is in history

Change-Id: Ieb939ac49626bf5c69adb57333207115d059f357
2020-03-06 09:56:03 +00:00
Automerger Merge Worker
4496632e5f [automerger skipped] Add cpu-set properties to serializer test am: 6ea9b8b580 -s ours
am skip reason: Change-Id I1232fec5f1d0be7e5fb6aa5c46f6c2c5529bfc6c with SHA-1 8e77b789f8 is in history

Change-Id: I71ddeba87d2c7ed9c4f1dff9dcc901fa28e886fb
2020-03-06 09:05:39 +00:00
Yifan Hong
dd4e7ef6ce init: restorecon libsnapshot rollback indicator
The rollback indicator is created during first stage init and
is unlabeled. Need to restorecon it properly so that it can
be properly deleted by update_engine later.

Bug: 149956852
Bug: 150907679
Test: apply OTA, reboot, look at serial console
Change-Id: Ie954023b557865691fec2ae378145596bf1973a9
2020-03-05 21:56:03 -08:00
David Anderson
960a81f4a1 init: Make sure ImageManager status files are labelled.
adb remount and snapshot-based updates use ImageManager in first-stage
init. This creates status files, which need to be labelled.

Bug: 148834619
Test: manual test
Change-Id: I72949fca2889f9e5612049844a78bf9355b48797
Merged-In: I72949fca2889f9e5612049844a78bf9355b48797
2020-03-05 21:55:12 -08:00
TreeHugger Robot
ae86eb783a Merge "base: access all new liblog symbols through liblog_functions" into rvc-dev 2020-03-06 05:32:29 +00:00
Josh Gao
64ff82ba68 adb: defer acknowledgement of pushed files until the end.
Previously, we were waiting for the other end to respond after every
file sent, which results in massive slowdown when there's any amount of
latency on the transport.

This improves performance on a cuttlefish instance with ~7ms RTT from:

    system/: 2037 files pushed, 0 skipped. 2.8 MB/s (762803979 bytes in 262.964s)

to:

    system/: 2037 files pushed, 0 skipped. 11.9 MB/s (762803979 bytes in 61.278s)

Bug: https://issuetracker.google.com/150827486
Test: ./test_device.py
Change-Id: I3a0c893faa5d455cc6ccbc86915a17e1b5abbfbe
2020-03-05 19:48:11 -08:00
Tom Cherry
b9a0e2ad60 base: access all new liblog symbols through liblog_functions
The original CL was missing these.

Bug: 149591522
Test: build
Merged-In: I99615b81cfe9166a00c812a8642ecf1244bf08b9
Change-Id: I99615b81cfe9166a00c812a8642ecf1244bf08b9
(cherry picked from commit d620ec7fb9)
2020-03-05 18:48:42 -08:00
PO HUNG CHEN
7fc6052fd3 Merge "Refine the exported DSU status" into rvc-dev 2020-03-06 02:25:21 +00:00
Automerger Merge Worker
2f1fee9a04 Merge "Fixed a typo in the version name" am: fd4e66221a am: 6e0a43f947
Change-Id: Ieab636d742132ecdf4b02ef22c60be73fa1b3b49
2020-03-06 01:16:29 +00:00
Automerger Merge Worker
ca3ef2bda1 [automerger skipped] Merge "Fixed a typo in the version name" am: fd4e66221a am: 6e0a43f947 -s ours
am skip reason: Change-Id I7401e8c092d4ee329fb1b5f23b7797f706b58faa with SHA-1 3d79b37a41 is in history

Change-Id: I2a3176614312e83288c4d84b29212b216aa5c994
2020-03-06 01:16:24 +00:00
Automerger Merge Worker
6e0a43f947 Merge "Fixed a typo in the version name" am: fd4e66221a
Change-Id: I1ca029e9050f5fde1eb8ac07b0416dab05b2f1b1
2020-03-06 01:04:00 +00:00
Automerger Merge Worker
14b9a9aaa0 Merge "run-as: improve error messages." am: 14dc6ad240 am: 3b30c9cd62
Change-Id: I1a690932ee673cdd96c4c6d15553cde7f4822281
2020-03-06 00:57:00 +00:00
Automerger Merge Worker
6b82ee166f Merge "liblog: Fix bugprone-macro-parentheses warnings" am: 561df7bfb3 am: 23285382a4
Change-Id: Iaf6165a5132368730ff5409ee5c1059abbfaeb04
2020-03-06 00:56:54 +00:00
Automerger Merge Worker
dc7d9fb474 Merge "run-as: improve error messages." am: 14dc6ad240 am: 3b30c9cd62
Change-Id: I8e363d20d908eea0a8cddfe922c66ba85761474a
2020-03-06 00:56:46 +00:00
Automerger Merge Worker
6d91911b8f Merge "liblog: Fix bugprone-macro-parentheses warnings" am: 561df7bfb3 am: 23285382a4
Change-Id: Ifdd445db85471d1ae407187231aadac69effdffd
2020-03-06 00:56:24 +00:00
Jiyong Park
fd4e66221a Merge "Fixed a typo in the version name" 2020-03-06 00:53:07 +00:00
Automerger Merge Worker
3b30c9cd62 Merge "run-as: improve error messages." am: 14dc6ad240
Change-Id: Ie2a7676e9fe315d695c9c89630aff48e5d407725
2020-03-06 00:35:23 +00:00
Automerger Merge Worker
23285382a4 Merge "liblog: Fix bugprone-macro-parentheses warnings" am: 561df7bfb3
Change-Id: Ie4979dd1827d4e986585530d4eee36a719cdaea3
2020-03-06 00:29:16 +00:00
Automerger Merge Worker
6ea0eeddf0 Merge "base: access all new liblog symbols through liblog_functions" am: 641e9e45b5 am: c3391b7664
Change-Id: Ic02acdbbfd1f849045cdc89b266dd1d19c69fd20
2020-03-06 00:15:18 +00:00
Automerger Merge Worker
2372288c68 Merge "base: access all new liblog symbols through liblog_functions" am: 641e9e45b5 am: c3391b7664
Change-Id: Id14bcc15fa2f6daa42e010400abd106904b1d35e
2020-03-06 00:15:01 +00:00
Automerger Merge Worker
c3391b7664 Merge "base: access all new liblog symbols through liblog_functions" am: 641e9e45b5
Change-Id: I4d2783287bea374130f4b534ec8bcee004adcdb7
2020-03-06 00:04:38 +00:00
Elliott Hughes
14dc6ad240 Merge "run-as: improve error messages." 2020-03-05 23:51:57 +00:00
Yifan Hong
133c060693 Merge changes from topic "snapshotctl_cleanup" into rvc-dev
* changes:
  libsnapshot: SnapshotMergeStats::Start/Finish
  libsnapshot: Expose SnapshotMergeStats
  libsnapshot: delete WaitForMerge.
  libsnapshot: handle errors in RemoveAllUpdateState appropriately.
  libsnapshot: remove snapshots properly after flashing
  libsnapshot: RemoveUpdateState on rollback.
  libsnapshot: NeedSnapshotsInFirstStageMount don't test for IsRecovery
  Allow ProcessUpdateState to be paused.
  libsnapshot: Re-expose InitiateMerge and ProcessUpdateState
  libsnapshot: Add prolog to RemoveAllUpdateStates.
  snapshotctl don't auto-merge.
  snapshotctl: init reports merge statistics
  libsnapshot/test: Re-enable the failing tests
2020-03-05 22:57:08 +00:00
Treehugger Robot
561df7bfb3 Merge "liblog: Fix bugprone-macro-parentheses warnings" 2020-03-05 22:44:04 +00:00
Tom Cherry
641e9e45b5 Merge "base: access all new liblog symbols through liblog_functions" 2020-03-05 21:29:09 +00:00