Commit graph

26399 commits

Author SHA1 Message Date
Mark Salyzyn
4fee4601a5 Merge "liblog: clean up SafetyNet unit tests"
am: 78b5f01051

Change-Id: If8dbe8eca771341516adf85aeb2ec98e75437041
2016-12-14 02:33:21 +00:00
Treehugger Robot
78b5f01051 Merge "liblog: clean up SafetyNet unit tests" 2016-12-14 02:23:37 +00:00
Josh Gao
b4360f4506 Merge "adb: add script to trace adbd."
am: 963d95d188

Change-Id: I7cadbecf38b56ffdfd97b5364443ccc569ed17e4
2016-12-14 01:12:16 +00:00
Josh Gao
963d95d188 Merge "adb: add script to trace adbd." 2016-12-14 01:06:55 +00:00
Christopher Ferris
39ce1328d3 Merge "Update for kernel headers v4.8.14."
am: 0c0f042736

Change-Id: Iadbb62362350d836e4e6744915d1b30e6cd89b5d
2016-12-13 23:47:53 +00:00
Christopher Ferris
0c0f042736 Merge "Update for kernel headers v4.8.14." 2016-12-13 23:40:01 +00:00
Josh Gao
52df920fd6 adb: add script to trace adbd.
Bug: http://b/31289465
Test: sh trace.sh
Change-Id: Id6e20e83742541aec6bfd9f4112adbdadc078f74
2016-12-13 14:31:17 -08:00
Mark Salyzyn
a91b426268 liblog: clean up SafetyNet unit tests
Move active code into helpers.

Test: gTest liblog-unit-tests
Change-Id: I5ade96edd71b7d773386f4d99eddbad076d10405
2016-12-13 13:47:48 -08:00
Josh Gao
6f37e54508 Merge "adb: retry install_listener for a while."
am: 2361ab0d31

Change-Id: I6d71a7badec82501a908fd0dd288897aa0797e49
2016-12-13 04:10:05 +00:00
Treehugger Robot
2361ab0d31 Merge "adb: retry install_listener for a while." 2016-12-13 04:01:54 +00:00
Christopher Ferris
1514bb4f2f Update for kernel headers v4.8.14.
Update sync.c to include the structurs from sw_sync.h. This uapi
header has been deleted.

Test: Built mips/arm/arm64/x86/x86_64. Built and booted angler.
Change-Id: I2495cb17b35f697fb8a2a00f6633ccb53f78293f
2016-12-12 18:59:42 -08:00
Josh Gao
f0f854bc76 adb: retry install_listener for a while.
install_listener can fail if we told a previous adb server to quit and
it hasn't finished doing so yet. Retry it for a few hundred
milliseconds to avoid this.

Bug: http://b/28618716
Test: nc -l 5037; adb server nodaemon
Change-Id: Ibbda8f2718b85a2b6a08985aa8d29aa2204a3ead
2016-12-12 18:20:57 -08:00
Elliott Hughes
88aa74b86f Merge "Revert "android_ids: move to bionic""
am: b0a15d8319

Change-Id: I858c898d058db9d835557a19b163f94a366ea7fa
2016-12-13 00:42:30 +00:00
Josh Gao
2f78a3f6a5 Merge changes from topic 'adb_trace'
am: 8e7c782eaa

Change-Id: I1545be5ffc0dedbeadf9efc3f275262bd3e8bfbc
2016-12-13 00:42:11 +00:00
Josh Gao
2ae0d626ce adb: add tracing to transport.cpp.
am: cfe72e290b

Change-Id: I9e1ab2db40dd0d0c066089e67e9cd06d792256fd
2016-12-13 00:37:29 +00:00
Josh Gao
553413598e adb: clang-format transport.cpp
am: 1290fbf5eb

Change-Id: I9b9ba18d99a39511ce598ef288b3a6199fe19aab
2016-12-13 00:37:22 +00:00
Josh Gao
78f473602f adb: add tracing to file_sync_service.cpp.
am: fd12aaa8c1

Change-Id: Id356cc3b533043f798594ec8cc8b32440581d50e
2016-12-13 00:37:16 +00:00
Josh Gao
49d9efe777 cutils: add adb trace tag.
am: e2d9732682

Change-Id: Iad5fbc8713db9b1a3ac1206f6d8610ae835ff36a
2016-12-13 00:37:09 +00:00
Josh Gao
d28920f745 libutils: allow multiple ATRACE_NAMEs in a scope.
am: 01937ee2b9

Change-Id: Iebecafe4f82249f29458279461c52e6c8d08e80e
2016-12-13 00:37:01 +00:00
Treehugger Robot
b0a15d8319 Merge "Revert "android_ids: move to bionic"" 2016-12-13 00:31:26 +00:00
Josh Gao
8e7c782eaa Merge changes from topic 'adb_trace'
* changes:
  adb: add tracing to transport.cpp.
  adb: clang-format transport.cpp
  adb: add tracing to file_sync_service.cpp.
  cutils: add adb trace tag.
  libutils: allow multiple ATRACE_NAMEs in a scope.
2016-12-13 00:28:09 +00:00
Elliott Hughes
7b7a8074e1 Revert "android_ids: move to bionic"
This reverts commit bc56847e84.

Change-Id: I2d00db0aaa7dfe292e36c6bdbaaa76230849e732
2016-12-12 22:11:29 +00:00
Josh Gao
cfe72e290b adb: add tracing to transport.cpp.
Bug: http://b/31289465
Test: systrace
Change-Id: I41968f447b61ef1eea2b933a5fd8623605c4dea6
2016-12-12 12:28:45 -08:00
Josh Gao
1290fbf5eb adb: clang-format transport.cpp
Bug: http://b/31289465
Test: none
Change-Id: If99a9f1d4d6fa1d34b0ac3bbfc7f2e6bfc188ff2
2016-12-12 12:28:45 -08:00
Josh Gao
fd12aaa8c1 adb: add tracing to file_sync_service.cpp.
Bug: http://b/31289465
Test: systrace
Change-Id: I186675ca0310ace0e1d35561fa0b910417dcedd7
2016-12-12 12:28:45 -08:00
Josh Gao
e2d9732682 cutils: add adb trace tag.
Bug: http://b/31289465
Test: systrace
Change-Id: I8537731febc6629f055b86f6e19b16104208c4f8
2016-12-12 12:28:45 -08:00
Josh Gao
01937ee2b9 libutils: allow multiple ATRACE_NAMEs in a scope.
Bug: http://b/31289465
Test: m
Change-Id: Iabd97439fa55ea285ce0501dbb4fd9d07149ae61
2016-12-12 12:28:04 -08:00
Nick Kralevich
869ce5d40a Merge "init/service.cpp: fix FD leak for services with consoles"
am: 4173d9b57c

Change-Id: Iaf8e2857ccb425cc7a41f286f5353c76333cba9d
2016-12-10 22:12:06 +00:00
Treehugger Robot
4173d9b57c Merge "init/service.cpp: fix FD leak for services with consoles" 2016-12-10 22:07:27 +00:00
Nick Kralevich
9596d2b95d init/service.cpp: fix FD leak for services with consoles
When init starts a service with a console, it tests for the presence of
a readable/writable console device. The test results in a leaked file
descriptor.

Use access() instead of open() to avoid leaking file descriptors.

Bug introduced in 70daa67062.

Test: compiles and device boots
Change-Id: I4efcfa0bb2cdb09f0455bc04a3a91e784bda7962
2016-12-10 12:20:11 -08:00
Elliott Hughes
1e62d3e0b8 Merge changes from topic 'fsconfig-2'
am: b0aa8b2369

Change-Id: I74940187c6aa296af360a93718015d6aaf3bce38
2016-12-10 00:24:28 +00:00
William Roberts
d677b76496 fs_config: add comment to header
am: acdf527c52

Change-Id: Ie861f2f18060f56b6cc21ec4b8c2df291ea5d435
2016-12-10 00:21:43 +00:00
William Roberts
d0abdb75a1 android_ids: move to bionic
am: bc56847e84

Change-Id: I45393361b58370755f88793e84e2ef59b53a16ea
2016-12-10 00:21:39 +00:00
Elliott Hughes
b0aa8b2369 Merge changes from topic 'fsconfig-2'
* changes:
  fs_config: add comment to header
  android_ids: move to bionic
2016-12-10 00:13:05 +00:00
Mark Salyzyn
dcd44168d3 Merge "utils: Add FastStrcmp.h"
am: 0f8890d985

Change-Id: Iaffc6c6cf76c3a018f44f7ea5a8f865598d7db74
2016-12-09 23:44:23 +00:00
Mark Salyzyn
0f8890d985 Merge "utils: Add FastStrcmp.h" 2016-12-09 23:37:15 +00:00
Mark Salyzyn
0eeb06b932 utils: Add FastStrcmp.h
Move existing fast<str*cmp> templates for general use, pulled from
the implementation used in logd that dealt with speed through cache
locality and subroutine call mitigation.  Rename to fastcmp.

Test: logd-benchmarks and based on manual profiling from the past
Bug: 31456426
Change-Id: Ic62f4a437fc3e06ffdeaae73a6f34e197957a6b0
2016-12-09 12:40:17 -08:00
William Roberts
bc56847e84 android_ids: move to bionic
Prevent others from using android_ids and force them
to use grp.h and pwd.h family of functions.

Test: Build and boot, verify services are running properly.
Bug: 27999086

Change-Id: Idcd75cf7e91a49ef07a0ed3bdb514ad61aa82e69
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-12-08 16:57:17 -08:00
William Roberts
acdf527c52 fs_config: add comment to header
Add a comment to android_filesystem_config.h
about AID and OEM Range "scraping" done by
build/tools/fs_config.

Test: Build and boot.

Change-Id: I2d4845d91546ae967a1ee5166b73d119938faccc
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-12-08 16:57:17 -08:00
Yabin Cui
76977937e2 Merge "libbacktrace_offline: support .ARM.exidx."
am: aece425166

Change-Id: I7b3821a215ed07753e3f8e71509807cf7639af3f
2016-12-07 20:41:21 +00:00
Yabin Cui
aece425166 Merge "libbacktrace_offline: support .ARM.exidx." 2016-12-07 20:34:32 +00:00
Yabin Cui
5d991bc351 libbacktrace_offline: support .ARM.exidx.
1. Read .ARM.exidx and .ARM.extab, provides these data to libunwind
through AccessMem.
2. In FindProcInfo, search .ARM.exidx for the idx entry of function
containing ip.
3. Add structures to store .ARM.exidx info in DebugFrameInfo, and
clean up the structure.
4. Add tests to test each unwind information (.eh_frame, .debug_frame,
.gnu_debugdata, .ARM.exidx) separately.

Bug: http://b/30974693
Test: run backtrace_test.
Test: run simpleperf runtest.py.
Change-Id: I9377a54379158bd35860efcf0e011423be7350d4
2016-12-07 10:25:33 -08:00
Bill Yi
7cac01b60c Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: a794775592

Change-Id: I083bb3a3dc47e13b5a17800734b5599d8324c6d3
2016-12-06 23:47:22 +00:00
Josh Gao
aa3de6ab23 Merge changes I1a122235,I6b22ead8
am: 3a7637715e

Change-Id: Id88e84333603816e2ed099b5d361ca9d140229e3
2016-12-06 23:46:49 +00:00
Josh Gao
ce7c08b810 Revert "Revert "adb: extend sync protocol's stat support.""
am: 5a1e3fdaf8

Change-Id: I6237cef612bbebb7a5f1ffc84eeb95e25f16089a
2016-12-06 23:46:47 +00:00
Josh Gao
34eb1a734f Revert "Revert "adb: move adb_strerror to sysdeps/win32/errno.cpp.""
am: a3577e1ac5

Change-Id: Ibdb68153627445b2a9be0582cecba13ad396aaac
2016-12-06 23:46:38 +00:00
Bill Yi
a794775592 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD 2016-12-06 15:07:48 -08:00
Josh Gao
3a7637715e Merge changes I1a122235,I6b22ead8
* changes:
  Revert "Revert "adb: extend sync protocol's stat support.""
  Revert "Revert "adb: move adb_strerror to sysdeps/win32/errno.cpp.""
2016-12-06 22:41:40 +00:00
Elliott Hughes
422a5128dd Merge "The "net.change" property is no longer needed."
am: e209ed7c44

Change-Id: I45a1ce3a1527a72e7ae974fd4dab7b77c6a899ee
2016-12-06 02:49:59 +00:00
Treehugger Robot
e209ed7c44 Merge "The "net.change" property is no longer needed." 2016-12-06 02:46:43 +00:00