Commit graph

56757 commits

Author SHA1 Message Date
Automerger Merge Worker
0cd6658eb0 Merge "adb: defer acknowledgement of pushed files until the end." am: 2263bcb4d0
Change-Id: Id6c15f4dd7604b35d5ae6b4847517c1ff32899bd
2020-03-10 02:12:06 +00:00
Josh Gao
2263bcb4d0 Merge "adb: defer acknowledgement of pushed files until the end." 2020-03-10 01:55:51 +00:00
Automerger Merge Worker
9b69f80df2 Merge "Fix bugprone-string-integer-assignment warnings" am: 262b58cd07
Change-Id: I0b060938438f06ed35d5e669efa23926aa77c85a
2020-03-10 00:29:42 +00:00
Automerger Merge Worker
8ae833f2e2 Merge "libdm: Fix WaitForFile early-returning on failed accesses." am: 66147bad94
Change-Id: I96c24c1b8d0941d291505e7668fdeda37542bdba
2020-03-10 00:29:20 +00:00
Chih-hung Hsieh
262b58cd07 Merge "Fix bugprone-string-integer-assignment warnings" 2020-03-10 00:07:58 +00:00
David Anderson
66147bad94 Merge "libdm: Fix WaitForFile early-returning on failed accesses." 2020-03-10 00:06:09 +00:00
Automerger Merge Worker
7f74c78779 Merge "Remove mips build." am: b34449d5fe
Change-Id: I3619a130c1c6ffa22c1e3a2e7b74241c2c43d4b1
2020-03-09 23:34:51 +00:00
Automerger Merge Worker
75ccbefde1 Merge "init: restorecon libsnapshot rollback indicator" am: d8f7b26ed2
Change-Id: Icdd2d8ffec5a2f8c46f8e614620f23e4b32a15b7
2020-03-09 23:34:44 +00:00
Automerger Merge Worker
7b12b02c89 Merge "liblog: minimum_log_priority should be atomic" am: ce71d36d13
Change-Id: Ic65abb534066f2bcaa1177ce8bc8ab272ef2cbd0
2020-03-09 23:34:35 +00:00
Treehugger Robot
b34449d5fe Merge "Remove mips build." 2020-03-09 23:10:04 +00:00
Yifan Hong
d8f7b26ed2 Merge "init: restorecon libsnapshot rollback indicator" 2020-03-09 23:09:05 +00:00
Tom Cherry
ce71d36d13 Merge "liblog: minimum_log_priority should be atomic" 2020-03-09 23:06:12 +00:00
Chih-Hung Hsieh
5d13645bfe Fix bugprone-string-integer-assignment warnings
* mdns.cpp:153:20: warning: an integer is interpreted as a character code
  when assigning it to a string; if this is intended, cast the integer to
  the appropriate character type; if you want a string representation, use
  the appropriate conversion facility [bugprone-string-integer-assignment]

Test: WITH_TIDY=1 make
Change-Id: Id9a790ac31722c6ee8886703939977b913ce95fe
2020-03-09 15:05:54 -07:00
Automerger Merge Worker
d5221600c9 Merge ""track-app" service showing debuggable/profileable apps" am: c6e64b3e1d
Change-Id: I476d5c0660ec277743dd021f21db903f602aa247
2020-03-09 21:42:24 +00:00
Treehugger Robot
c6e64b3e1d Merge ""track-app" service showing debuggable/profileable apps" 2020-03-09 21:21:38 +00:00
Automerger Merge Worker
17dd7ff06c Merge "Add new directory for stats metadata" am: 3a4e3825f4
Change-Id: Ia6c223da76ecff16e5e0ceaed33abc583031957f
2020-03-09 20:04:06 +00:00
Automerger Merge Worker
05fcfb6d69 Merge "adb: improve logging of key loading slightly." am: 9da07506de
Change-Id: I4a657609956eaf145426cd5b783ec11f32a64449
2020-03-09 19:57:34 +00:00
Tom Cherry
bbb16022c7 liblog: minimum_log_priority should be atomic
In case multiple threads try to reference this variable while it is
being set, it should be atomic so that all threads always see a valid
value.

Bug: 150898477
Test: liblog, libbase unit tests
Change-Id: If6c9e291f2471b96a752dc6e76e3e63458b71391
2020-03-09 12:43:18 -07:00
Jeffrey Huang
3a4e3825f4 Merge "Add new directory for stats metadata" 2020-03-09 18:09:21 +00:00
Treehugger Robot
9da07506de Merge "adb: improve logging of key loading slightly." 2020-03-09 18:00:25 +00:00
Elliott Hughes
401c78780f adb: improve logging of key loading slightly.
In particular, always include the file name in the log.

Bug: http://b/144462309
Test: adb kill-server && adb devices -l && cat /tmp/adb.*.log
Change-Id: I66b5e063b00381f9dfa9ace222cad3e415e4f43b
2020-03-07 12:52:36 -08:00
Yifan Hong
d91998f1c4 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-06 22:50:08 -08:00
Elliott Hughes
49e6ee928f Remove mips build.
For now this leaves the ability to cross-unwind a mips process, but we
should probably clean that up too. We need to remove the build remnants so
that we can clean up the build system itself (otherwise it sees us talking
about an architecture it doesn't know about, and assumes that something's
wrong).

Test: treehugger
Change-Id: I2862c630cec95dbdd474e34c3568d0e1a6d44b16
2020-03-06 22:02:09 -08:00
Automerger Merge Worker
27c6a6185d Merge "Move GetMountedEntryForUserdata to fs_mgr.h" am: cc642ec725
Change-Id: Ided19cec2d38c098193e69a26d60d4beade8ab26
2020-03-07 05:36:19 +00:00
Treehugger Robot
cc642ec725 Merge "Move GetMountedEntryForUserdata to fs_mgr.h" 2020-03-07 05:14:38 +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
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
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
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
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
151e74894f Merge "debuggerd: add an opt-out for OEMs that would rather collect core dumps." 2020-03-06 17:17:51 +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
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
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
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
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
Tom Cherry
d620ec7fb9 base: access all new liblog symbols through liblog_functions
The original CL was missing these.

Bug: 149591522
Test: build
Change-Id: I99615b81cfe9166a00c812a8642ecf1244bf08b9
2020-03-05 10:52:01 -08:00
Automerger Merge Worker
cd0552df3c Merge "Update init.rc for statsd setup" am: 8c20f9e6b5
Change-Id: I35e64dec0ab48d3b6275bd172e9c86fe1e65b37a
2020-03-05 17:02:15 +00:00
Automerger Merge Worker
3299f7aeab Merge changes from topics "libsnapshot_delete_initiate", "snapshotctl_cleanup", "update_engine_vab_metrics" am: 198651c202
Change-Id: I54d88e441d28aaa561cfaacdbbf5026d71b604d6
2020-03-05 17:01:17 +00:00
Automerger Merge Worker
d3cc4e8dcf libsnapshot: Expose SnapshotMergeStats am: 038d6d7656
Change-Id: I77d3a1a67c9e75dd6a5bc0c59a92a89a01fa1ba6
2020-03-05 17:01:15 +00:00
Automerger Merge Worker
7d6832e97a libsnapshot: delete WaitForMerge. am: f21c7cdc4a
Change-Id: I6d8cf854d8ddce2635d3b944352f4218d40f248e
2020-03-05 17:01:09 +00:00
Automerger Merge Worker
64aa390f62 libsnapshot: handle errors in RemoveAllUpdateState appropriately. am: 32253d92eb
Change-Id: I30032e9dfa6a52b4e86bba2d3ccd5322f17699c5
2020-03-05 17:01:07 +00:00
Automerger Merge Worker
354b06ff10 libsnapshot: remove snapshots properly after flashing am: 44b93df300
Change-Id: I3358ca3c6648888daf62f58e1048e630b5b83afe
2020-03-05 17:01:05 +00:00
Automerger Merge Worker
65b6aad759 libsnapshot: RemoveUpdateState on rollback. am: e256e3b7d4
Change-Id: I6f106aa8f07945bcbd4842dadfccd0e028ecda30
2020-03-05 17:01:03 +00:00
Automerger Merge Worker
08e358c1a3 libsnapshot: NeedSnapshotsInFirstStageMount don't test for IsRecovery am: 7fd9b8b7f3
Change-Id: I67862ddd443805f765fc26d6c349107e57ad9591
2020-03-05 17:01:00 +00:00