Commit graph

56777 commits

Author SHA1 Message Date
Automerger Merge Worker
3a3c6ec494 Merge "adbd: make libadbd_services cc_library again." am: 0ac447ab95
Change-Id: I0bdf847d77bd38655aad30c46044e7891766405c
2020-03-10 21:04:15 +00:00
Tianjie Xu
0ac447ab95 Merge "adbd: make libadbd_services cc_library again." 2020-03-10 18:43:30 +00:00
Automerger Merge Worker
944d5b0656 Merge changes from topic "no_snapshot_callstack" am: 86008cccb3
Change-Id: I9b061b9a8197be2d91cb7aa6b7db23f2c5fb2ec5
2020-03-10 17:26:01 +00:00
Yifan Hong
86008cccb3 Merge changes from topic "no_snapshot_callstack"
* changes:
  Revert "libsnapshot::RemoveAllUpdateState log stack"
  Revert "libsnapshot callstack files readable by dumpstate"
  libsnapshot: delete InitiateMergeAndWait.
2020-03-10 17:08:54 +00:00
Automerger Merge Worker
58894ac28e Merge "liblog: add API level guard to NDK log.h header" am: cc032194b3
Change-Id: I27428102301041120007667f7aa0e1b9c4de1e52
2020-03-10 16:16:47 +00:00
Tom Cherry
cc032194b3 Merge "liblog: add API level guard to NDK log.h header" 2020-03-10 16:00:44 +00:00
Tom Cherry
59e93a55fc liblog: add API level guard to NDK log.h header
Bug: 119867234
Test: build
Change-Id: I6fdd7c070af06f04314b9bf7bbfede2a106e0d7c
2020-03-10 08:50:46 -07:00
Automerger Merge Worker
0d0e8f6a4a Merge "Convert gsid to use the dynamic AIDL service infrastructure" am: 14326821f0
Change-Id: Id69799c15b20dd2deb74cd80386c6ff8861da33d
2020-03-10 10:11:48 +00:00
Howard Chen
14326821f0 Merge "Convert gsid to use the dynamic AIDL service infrastructure" 2020-03-10 09:49:01 +00:00
Automerger Merge Worker
bacaf76c0e Merge "Set apex_available property" am: 2401f5f2cc
Change-Id: I6b870349f9c526bda074e045ed52ffbd93b11249
2020-03-10 07:56:11 +00:00
Treehugger Robot
2401f5f2cc Merge "Set apex_available property" 2020-03-10 07:30:36 +00:00
Automerger Merge Worker
e888ebcbae Merge "Convert vts configs to Android.bp" am: ecfdda2c14
Change-Id: I7159313ba7948da3a0a9c55ef527cb23e88058f6
2020-03-10 05:23:01 +00:00
Treehugger Robot
ecfdda2c14 Merge "Convert vts configs to Android.bp" 2020-03-10 05:00:33 +00:00
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
Yifan Hong
78671597ca Revert "libsnapshot::RemoveAllUpdateState log stack"
Revert submission snapshotctl_callstack

Reason for revert: Callstack should not be logged
Reverted Changes:
Ib80c74a9a:Temporarily add libutilscallstack dependency
I2dfb6b7f1:libsnapshot::RemoveAllUpdateState log stack

Test: none
Bug: 148818798

Change-Id: I34683e93f10971629737f6fe648b25c6066c702f
2020-03-09 16:14:30 -07:00
Yifan Hong
4a64da427e Revert "libsnapshot callstack files readable by dumpstate"
This reverts commit faa49d1d00.

Reason for revert: Callstack should not be logged.

Test: none
Bug: 148818798

Change-Id: Ie5506ae0c7408e255a464b2f403d0a47d272229e
2020-03-09 16:14:30 -07:00
Yifan Hong
7a0fb3562f libsnapshot: delete InitiateMergeAndWait.
Now that update_engine is responsible for initiating the
merge, InitiateMergeAndWait function becomes useless.

Bug: 147696014
Test: libsnapshot_test
Change-Id: I5473dc543ca8ac2fd31f597720847b02d0e5e33d
2020-03-09 16:14:30 -07: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
Josh Gao
7f8a37c8c7 adbd: make libadbd_services cc_library again.
For currently unknown reasons, sideloading is broken with
libadbd_services as a cc_library_static.

Partial revert of commit a9b62d5452.

Bug: http://b/151056300
Test: xunchang@ tested manually
Change-Id: Iaffad9c476ba0adcffc5db512ba4a7ee0fb5cb22
2020-03-09 15:20:55 -07: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
Jiyong Park
8bf9b1632e Set apex_available property
The marked library(ies) were available to the APEXes via the hand-written
whitelist in build/soong/apex/apex.go. Trying to remove the whitelist
by adding apex_available property to the Android.bp of the libraries.

In this change, following libs were made available to all apexes because
their usage is quite common and there is no reason to restrict them
to some APEXes.

* libbase_headers
* libcutils, libcutils_headers
* libutils_headers, libsystem_headers
* liblog_headers
* libbacktrace, libbacktrace_headers
* libcrypto_utils

Bug: 150999716
Test: m
Change-Id: If3d3652e6604ed4f6d7694fe7ac61ae496621026
2020-03-09 16:38:02 +09:00
Dan Willemsen
a8f188f011 Convert vts configs to Android.bp
Test: treehugger
Change-Id: Ibe8ed03555ac78ee38be6511eb4169cddfcd3555
2020-03-07 21:21:33 -08: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