Commit graph

27127 commits

Author SHA1 Message Date
Mark Salyzyn
43dc72ffef Merge "liblog: restructure log/log.h and android/log.h" am: 11a7165ecf am: 9fd2ffc145 am: 5290d85f54
am: 1104ceb573

Change-Id: I34fff2d86ddd3c769dfa59b54a176b5908a0233f
2016-10-24 20:57:04 +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
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
670d1eb23b Merge "init: account for "init.svc." prefix in IsValidName" am: 8cf0bd75f7 am: 6b03c273b1 am: 68a9f5a14f
am: 5115f1c77a

Change-Id: Idfd3bb1f56023a5a8e061b93554f3e855c09584b
2016-10-24 17:48:57 +00: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
11361e8b6a resolve merge conflicts of da142bc to nyc-mr2-dev-plus-aosp
am: bae5e2f180

Change-Id: Id8fb6d7af9778c85d662054b3024585b4c29a3e4
2016-10-24 17:12:51 +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
4377cd807c Merge "Move CapturedStderr to test_util library" am: 0ca2fe4c43 am: 1d86d453ad
am: d53d187531

Change-Id: I41ee9b60e5aeda9f4f06c61513f5cf4ddd70d5d5
2016-10-23 00:57:15 +00: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
ea38d337e0 Merge "Move "adb shell" over to getopt(3), and allow -tt on old devices." am: 620469a4ac am: f58d06a918
am: 41d9b5e264

Change-Id: Ibb7cff3369a3ae351a3d47ed3410b8e256b96b52
2016-10-22 18:16:22 +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
a21bcf27a4 Merge "libion: open /dev/ion read-only" am: 74552a9e7b am: 65233f2217
am: 34a16b45c5

Change-Id: I3f23fd987afd71835861c10f0c4b9ee6525fee24
2016-10-22 00:30:52 +00: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
1f53c054eb Merge "healthd: move binder fd to not use EPOLLWAKEUP" into nyc-mr1-dev am: a3bd97a019 am: 09136d8a74
am: 0ee30504bc

Change-Id: If904a7d547084f4cf948fc03ef90ba43795bb5b4
2016-10-21 21:56:12 +00:00
Tim Murray
765ac34dd4 healthd: move binder fd to not use EPOLLWAKEUP am: e89ea5eb85 am: 098babc7c8
am: b9ede3dbba

Change-Id: I6b8817f05bf54d58b1ac9ed2fa1289b78190adc4
2016-10-21 21:55:56 +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
ac72e1c768 Merge "logd: mLastWorstPidOFSystem crash" am: c75a32aae3 am: ead6503178
am: 7650bc6318

Change-Id: I6b602ad793a8182a32d21092e0642532d7cd5eec
2016-10-21 20:37:09 +00: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
Mark Salyzyn
fa07f9dc4b logd: mLastWorstPidOFSystem crash
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-21 10:20:55 -07:00
Tim Murray
e89ea5eb85 healthd: move binder fd to not use EPOLLWAKEUP
The binder fd doesn't need to use EPOLLWAKEUP and shouldn't; if it does,
it will prevent suspend unnecessarily.

bug 32180327

Change-Id: I292f1ada0c698290f6bd5518b237867ed69ec391
2016-10-21 09:11:49 -07:00
Dan Albert
0b058f2c9d Merge "Add license to ndk_headers." am: c741dd4838 am: e69242a71b
am: 2789708444

Change-Id: I17b067f1a150e21c3151a85cd57ea1acae538c03
2016-10-20 22:32:10 +00:00
Dan Albert
2789708444 Merge "Add license to ndk_headers." am: c741dd4838
am: e69242a71b

Change-Id: I70e2b153d2012160268c2ab6b77364aacbe168ae
2016-10-20 22:24:22 +00:00
Dan Albert
e69242a71b Merge "Add license to ndk_headers."
am: c741dd4838

Change-Id: I395dd1e24646ce84c47870f5619b4117a159a861
2016-10-20 22:17:09 +00:00
Treehugger Robot
c741dd4838 Merge "Add license to ndk_headers." 2016-10-20 22:12:40 +00:00
Colin Cross
c6f6dad32a Merge "Add missing host ldlibs" am: fc75f94643 am: 8355e6c097
am: 55901abc8e

Change-Id: I08ec5e3ce262035883d3207ffa9b6f0eb1b22269
2016-10-20 19:51:59 +00:00