Commit graph

26014 commits

Author SHA1 Message Date
Mark Salyzyn
003248a984 liblog: logd: logcat: Split out log/logger.h into public and private. am: aeaaf81c2c am: 28fcac705b
am: df8ca4c0cf

Change-Id: Idd47b90090afa2bd3f1ef06452625cf935405567
2016-10-24 23:01:11 +00:00
Mark Salyzyn
df8ca4c0cf liblog: logd: logcat: Split out log/logger.h into public and private. am: aeaaf81c2c
am: 28fcac705b

Change-Id: I7ab1efe657155ae67111f58259005bf32f261573
2016-10-24 22:56:42 +00:00
Mark Salyzyn
28fcac705b liblog: logd: logcat: Split out log/logger.h into public and private.
am: aeaaf81c2c

Change-Id: I124c69673c30bb5f2259849792ed4ca99f4d6b60
2016-10-24 22:53:11 +00:00
Josh Gao
9e112c9b44 Merge changes I34ba5757,Ie65a762a am: 63660add3f am: f99573ae8c
am: f0742f33ea

Change-Id: I37445e01b13ac0540ce9d66c6577f7fe7091e771
2016-10-24 21:26:39 +00:00
Josh Gao
7617a039f6 adb: fix test_sighup. am: 470622f064 am: 8baf1198ee
am: 48ba39854e

Change-Id: I318a37faf0f015450520e6d53fe3db16db13a38d
2016-10-24 21:26:31 +00:00
Josh Gao
1ba3df9860 adb: fix race condition in test_non_interactive_sigint. am: e76b9f3dde am: a06580956e
am: af9613732f

Change-Id: I3ea0261629ef747c41eca9f6af30b871d2182d59
2016-10-24 21:26:22 +00:00
Josh Gao
f0742f33ea Merge changes I34ba5757,Ie65a762a am: 63660add3f
am: f99573ae8c

Change-Id: Iab72bdb684133a81591d915243ca614396a47910
2016-10-24 21:23:01 +00:00
Josh Gao
48ba39854e adb: fix test_sighup. am: 470622f064
am: 8baf1198ee

Change-Id: Icb4da0c75dcb7db6a6b22fea7455d07449315c04
2016-10-24 21:22:52 +00:00
Josh Gao
af9613732f adb: fix race condition in test_non_interactive_sigint. am: e76b9f3dde
am: a06580956e

Change-Id: I30d08aa86ab4103029aa41aaf1451e46f7797948
2016-10-24 21:22:46 +00:00
Josh Gao
f99573ae8c Merge changes I34ba5757,Ie65a762a
am: 63660add3f

Change-Id: I9a3c5dda5edbbcbeb77f519eb6218a5e00d2fdef
2016-10-24 21:18:59 +00:00
Josh Gao
8baf1198ee adb: fix test_sighup.
am: 470622f064

Change-Id: I342cbd04804e3d8d92d04ab088c6980d67bbc8e8
2016-10-24 21:18:58 +00:00
Josh Gao
a06580956e adb: fix race condition in test_non_interactive_sigint.
am: e76b9f3dde

Change-Id: Ib2b6c1118cb48c337c12efbd223c87fee76837f2
2016-10-24 21:18:51 +00:00
Josh Gao
63660add3f Merge changes I34ba5757,Ie65a762a
* changes:
  adb: fix test_sighup.
  adb: fix race condition in test_non_interactive_sigint.
2016-10-24 21:13:18 +00:00
Mark Salyzyn
1104ceb573 Merge "liblog: restructure log/log.h and android/log.h" am: 11a7165ecf am: 9fd2ffc145
am: 5290d85f54

Change-Id: I1b4fb26967d5dfe5af102710fbf9b5170dd19f04
2016-10-24 20:53:34 +00:00
Mark Salyzyn
5290d85f54 Merge "liblog: restructure log/log.h and android/log.h" am: 11a7165ecf
am: 9fd2ffc145

Change-Id: Ifa33b20a139a030d4c6e1e1e41f771d960d3198c
2016-10-24 20:49:03 +00:00
Mark Salyzyn
9fd2ffc145 Merge "liblog: restructure log/log.h and android/log.h"
am: 11a7165ecf

Change-Id: I6ebdebdd82e8a59a711ee0fe41056abdacb084b3
2016-10-24 20:46:08 +00:00
Treehugger Robot
11a7165ecf Merge "liblog: restructure log/log.h and android/log.h" 2016-10-24 20:42:29 +00:00
Josh Gao
470622f064 adb: fix test_sighup.
Bug: http://b/32336914
Test: python test_device.py
Change-Id: I34ba5757b5e650d79327dc6779064acd850ce28e
2016-10-24 13:34:20 -07:00
Josh Gao
e76b9f3dde adb: fix race condition in test_non_interactive_sigint.
Fix race condition in the test_non_interactive_sigint test by
looping for a while.

Bug: http://b/32336914
Test: python test_device.py
Change-Id: Ie65a762ad6f04815231add5444762c4c0ffd31cb
2016-10-24 13:34:17 -07:00
Mark Salyzyn
aeaaf81c2c liblog: logd: logcat: Split out log/logger.h into public and private.
log/logger.h pieces moved into log/log.h.  Correct for some
minor Android Coding standards.

Test: gTests liblog-unit-tests, logd-unit-tests and logcat-unit-tests
Bug: 19235719
Bug: 26552300
Bug: 31289077
Bug: 31456426
Change-Id: I0a19fd8788eec20a582e72e4c62c04534bdb1b9a
2016-10-24 11:12:49 -07:00
Mark Salyzyn
749a298dfd liblog: restructure log/log.h and android/log.h
We went too far, so this is a partial revert, part deux.

Keep general purpose logging macros in android/log.h for the NDK.
More internal features like Radio, System and Events logging are
moved back to log/log.h.  Correct liblog ndk symbols.  Correct for
some Android Coding standards.

Test: compile
Bug: 31992412
Change-Id: Id3731496fa226e8c170305d0d2a1859e8cf67e14
2016-10-24 11:03:49 -07:00
Iliyan Malchev
5115f1c77a Merge "init: account for "init.svc." prefix in IsValidName" am: 8cf0bd75f7 am: 6b03c273b1
am: 68a9f5a14f

Change-Id: Ia56ffdfc942ab4bb07a3b0856804fff3ccbc73b0
2016-10-24 17:45:22 +00:00
Iliyan Malchev
68a9f5a14f Merge "init: account for "init.svc." prefix in IsValidName" am: 8cf0bd75f7
am: 6b03c273b1

Change-Id: I808cfaf83a575470f50b50b5d17791144d6c291e
2016-10-24 17:41:52 +00:00
Iliyan Malchev
6b03c273b1 Merge "init: account for "init.svc." prefix in IsValidName"
am: 8cf0bd75f7

Change-Id: I41c9d2472412a4b4cafb23a39598ea0e31619629
2016-10-24 17:38:21 +00:00
Treehugger Robot
8cf0bd75f7 Merge "init: account for "init.svc." prefix in IsValidName" 2016-10-24 17:33:08 +00:00
Mark Salyzyn
bae5e2f180 resolve merge conflicts of da142bc to nyc-mr2-dev-plus-aosp
Test: inspection
Bug: 32247044
Bug: 31237377
Change-Id: I46df422fe14b8c54770c612b139317e6a9801b9c
2016-10-24 10:04:25 -07:00
Mark Salyzyn
da142bcdf7 logd: mLastWorstPidOFSystem crash am: ab8ad62939
am: 045bd50ca4

Change-Id: I58bee4e31d46e7e7fc59283996d8cdba40e43e0d
2016-10-24 16:44:48 +00:00
Mark Salyzyn
045bd50ca4 logd: mLastWorstPidOFSystem crash
am: ab8ad62939

Change-Id: Ie19d2dabee0766cb8ae76cc27fe6e8dd5d325207
2016-10-24 16:41:18 +00:00
Iliyan Malchev
00860da2f0 init: account for "init.svc." prefix in IsValidName
For each service ${service} described in a .rc file, init creates the
property init.svc.${service}.  This implies that service-name lengths
are bound by the maximum size of a property.  This patch accounts for
the "init.svc." prefix and the maximum property-name length when
validating a service name.

Test: pass

Change-Id: I32dffa37363b41a8211f7644600b81973d30a3b2
Signed-off-by: Iliyan Malchev <malchev@google.com>
2016-10-24 08:46:06 -07:00
Mark Salyzyn
ab8ad62939 logd: mLastWorstPidOFSystem crash
(cherry pick from commit fa07f9dc4b)

mLastWorstPidOfSystem is filled with iterator references
that are not from AID_SYSTEM to aid the performance. But
we only clear entries from the list during erase if they
are from AID_SYSTEM. Remove the filter check in erase so
the stale references will be removed.

The conditions that caused this failure are difficult to
reproduce and are rare.

Test: gTests logd-unit-tests, liblog-unit-tests and logcat-unit-tests
Bug: 32247044
Bug: 31237377
Change-Id: Ie405dd643203b816cac15eef5c97600551cee450
2016-10-24 07:41:05 -07:00
Wei Wang
d53d187531 Merge "Move CapturedStderr to test_util library" am: 0ca2fe4c43
am: 1d86d453ad

Change-Id: Id6d01fbc78c319ca0f19b5a44acdef70df2ad4e8
2016-10-23 00:54:13 +00:00
Wei Wang
1d86d453ad Merge "Move CapturedStderr to test_util library"
am: 0ca2fe4c43

Change-Id: I35391d29989da0b8769e780abb4668b6c0ab19d6
2016-10-23 00:51:13 +00:00
Treehugger Robot
0ca2fe4c43 Merge "Move CapturedStderr to test_util library" 2016-10-23 00:44:10 +00:00
Elliott Hughes
41d9b5e264 Merge "Move "adb shell" over to getopt(3), and allow -tt on old devices." am: 620469a4ac
am: f58d06a918

Change-Id: Iba6f242d33dec9b564d1a37ada1377c458f2f1e4
2016-10-22 18:13:52 +00:00
Elliott Hughes
f58d06a918 Merge "Move "adb shell" over to getopt(3), and allow -tt on old devices."
am: 620469a4ac

Change-Id: I4849d18fcd2afe0c1e5d3b2bdf3a3a755e557e91
2016-10-22 18:11:44 +00:00
Elliott Hughes
620469a4ac Merge "Move "adb shell" over to getopt(3), and allow -tt on old devices." 2016-10-22 18:06:46 +00:00
Wei Wang
8c176302e6 Move CapturedStderr to test_util library
Bug: 32181382
Test: run /data/nativetest(64)/binderTextOutputTest
Change-Id: Ifb2e1f6af2c3f57b5cbed7dde65efb31253c52a2
2016-10-22 10:35:21 -07:00
Jeff Vander Stoep
34a16b45c5 Merge "libion: open /dev/ion read-only" am: 74552a9e7b
am: 65233f2217

Change-Id: I442f4a0f512a3f3a8330ea4ef00e45dbbeb2cdfd
2016-10-22 00:27:51 +00:00
Jeff Vander Stoep
65233f2217 Merge "libion: open /dev/ion read-only"
am: 74552a9e7b

Change-Id: Icaf66d489944194a4f5882af38d984892e9d1c44
2016-10-22 00:25:21 +00:00
Treehugger Robot
74552a9e7b Merge "libion: open /dev/ion read-only" 2016-10-22 00:19:39 +00:00
Tim Murray
0ee30504bc Merge "healthd: move binder fd to not use EPOLLWAKEUP" into nyc-mr1-dev am: a3bd97a019
am: 09136d8a74

Change-Id: I298e5112a1fdb5257f0fc69ba786d8bebf90c9b3
2016-10-21 21:54:02 +00:00
Tim Murray
b9ede3dbba healthd: move binder fd to not use EPOLLWAKEUP am: e89ea5eb85
am: 098babc7c8

Change-Id: I9ff934ef70aa89c02edcc8687249655ad86d806f
2016-10-21 21:53:49 +00:00
Tim Murray
09136d8a74 Merge "healthd: move binder fd to not use EPOLLWAKEUP" into nyc-mr1-dev
am: a3bd97a019

Change-Id: Iec84824eed209ba0769cae03c9a1813eca9817bd
2016-10-21 21:49:51 +00:00
Tim Murray
098babc7c8 healthd: move binder fd to not use EPOLLWAKEUP
am: e89ea5eb85

Change-Id: I2e5a55d3bc381baa679e39e63d37164f76ffdcfc
2016-10-21 21:49:50 +00:00
Tim Murray
a3bd97a019 Merge "healthd: move binder fd to not use EPOLLWAKEUP" into nyc-mr1-dev 2016-10-21 21:41:29 +00:00
Jeff Vander Stoep
1ba4e981db libion: open /dev/ion read-only
/dev/ion driver does not recognize the write operation [1] so open it
read-only.

[1] http://lxr.free-electrons.com/source/drivers/staging/android/ion/ion.c?v=4.5#L1369

Test: Angler builds and boots
Bug: 32120194
Change-Id: I9b26d43ea32cb24426404668701df1f1648d336c
2016-10-21 14:29:22 -07:00
Elliott Hughes
cabfa1177f Move "adb shell" over to getopt(3), and allow -tt on old devices.
From the bug:

  Say we run a new adb against an old device (like KitKat). Even with a new
  client ADB, in this configuration, "adb shell" will create a remove tty
  unconditionally. So if the user runs "adb shell -t -t", we shouldn't fail
  with a message about the remote device not supporting -tT options --- the
  user asked to create a tty unconditionally, and since we're going to create
  a tty unconditionally, we should just succeed. (That it's going to succeed
  due to protocol inadequacy instead of succeeding on purpose is irrelevant.)

  That adb fails in this case makes scripts more complicated, since they can't
  just pass "-t -t" unconditionally if they want a tty and to work on all
  device versions, even if the script requires a new-ish adb locally.

Bug: http://b/32216152
Bug: http://b/32219151
Test: test_device.py
Change-Id: I8ab7c8dfa212209a7ab43c1f0832eeac26d2e42f
2016-10-21 14:22:40 -07:00
Mark Salyzyn
7650bc6318 Merge "logd: mLastWorstPidOFSystem crash" am: c75a32aae3
am: ead6503178

Change-Id: Ib5b67538c9586186d98987254a5b313e0c84d48c
2016-10-21 20:27:31 +00:00
Mark Salyzyn
ead6503178 Merge "logd: mLastWorstPidOFSystem crash"
am: c75a32aae3

Change-Id: Ief8a0847243a0f2661192325efac5ce965dde92a
2016-10-21 20:17:59 +00:00
Mark Salyzyn
c75a32aae3 Merge "logd: mLastWorstPidOFSystem crash" 2016-10-21 20:14:21 +00:00