Chih-Hung Hsieh
12ad1c6dc4
Merge "Fix google-explicit-constructor warnings in logd." am: 33bf662195
am: 7e74e81646
...
am: 43da1271b1
Change-Id: I886845d655183c23df92d76dbfa99ad040ee246f
2016-08-03 16:39:48 +00:00
Chih-Hung Hsieh
43da1271b1
Merge "Fix google-explicit-constructor warnings in logd." am: 33bf662195
...
am: 7e74e81646
Change-Id: Ic22dae499883335effda3c1b6ce8d33d1407fcf1
2016-08-03 16:36:49 +00:00
Chih-Hung Hsieh
7e74e81646
Merge "Fix google-explicit-constructor warnings in logd."
...
am: 33bf662195
Change-Id: Ib3f3dd92b3339f778dec8dd9778d5e3cbba5ba0c
2016-08-03 16:34:20 +00:00
Treehugger Robot
33bf662195
Merge "Fix google-explicit-constructor warnings in logd."
2016-08-03 16:29:17 +00:00
Elliott Hughes
54c7d892a1
Merge "Have init kill the process group." am: 9a5300fcb8
am: 963de55342
...
am: cb647e9318
Change-Id: I4e100673a6104adee4a2414fd694fd350013b934
2016-08-02 23:15:03 +00:00
Elliott Hughes
cb647e9318
Merge "Have init kill the process group." am: 9a5300fcb8
...
am: 963de55342
Change-Id: Ic1a03c113d4615d793dae7b4273deb37a956fd5c
2016-08-02 23:12:09 +00:00
Elliott Hughes
963de55342
Merge "Have init kill the process group."
...
am: 9a5300fcb8
Change-Id: I692c5fabfaea39e7ed6c9de5f6ad245330e3442c
2016-08-02 23:10:29 +00:00
Treehugger Robot
9a5300fcb8
Merge "Have init kill the process group."
2016-08-02 23:01:54 +00:00
Elliott Hughes
1e73024653
Have init kill the process group.
...
killProcessGroup actually works on cgroups. Kill the POSIX process
group ourselves.
Bug: http://b/29751426
Change-Id: I1a2808488510f4262811b6407bcd0948ad23bc60
2016-08-02 14:20:40 -07:00
Dan Willemsen
0983786ca3
Merge "Remove Brillo-specific LOCAL_MODULE_TAGS" am: 11708e0236
am: 5c72c9688f
...
am: f8e59569e2
Change-Id: I346733f7277ade2001c562ee1d37e3a96ba22a4a
2016-08-02 20:51:35 +00:00
Dan Willemsen
f8e59569e2
Merge "Remove Brillo-specific LOCAL_MODULE_TAGS" am: 11708e0236
...
am: 5c72c9688f
Change-Id: I6b85fff1859b5b5c0676c822e51f9a28d8a417b3
2016-08-02 20:45:59 +00:00
Dan Willemsen
5c72c9688f
Merge "Remove Brillo-specific LOCAL_MODULE_TAGS"
...
am: 11708e0236
Change-Id: I36fe7de8fc5c4bc911c5860b33aef201adde0ed9
2016-08-02 20:41:06 +00:00
Dan Willemsen
11708e0236
Merge "Remove Brillo-specific LOCAL_MODULE_TAGS"
2016-08-02 20:30:06 +00:00
Chih-Hung Hsieh
9e70ba6352
Fix google-explicit-constructor warnings in logd.
...
Bug: 28341362
Change-Id: I5b419c40593982925034e9b7217b0eb53c51adcb
Test: build with WITH_TIDY=1
2016-08-02 11:31:44 -07:00
Josh Gao
0538bcd4ed
Merge changes I1d398d19,I8f20b3cd am: c97b73aa83
am: 0889353fa5
...
am: 6c41b5efb1
Change-Id: I6d24400da63131d42083a9885200386d0bf8bccb
2016-08-01 22:05:49 +00:00
Josh Gao
6c41b5efb1
Merge changes I1d398d19,I8f20b3cd am: c97b73aa83
...
am: 0889353fa5
Change-Id: I7f9f866d38f18206dff5738050d31ed27400294a
2016-08-01 22:02:51 +00:00
Josh Gao
0889353fa5
Merge changes I1d398d19,I8f20b3cd
...
am: c97b73aa83
Change-Id: I9a22ba63f4306c17933624f4c99380702f6e701e
2016-08-01 22:00:22 +00:00
Treehugger Robot
c97b73aa83
Merge changes I1d398d19,I8f20b3cd
...
* changes:
adb: fix stat on Windows.
adb: extract Windows bits out of directory_exists test.
2016-08-01 21:54:00 +00:00
Chih-Hung Hsieh
b143c9708c
resolve merge conflicts of d072ed3
to nyc-mr1-dev-plus-aosp
...
Change-Id: Ifdd67548e252fcd73833a9d017aa8205bf749f70
2016-08-01 13:44:54 -07:00
Chih-Hung Hsieh
d072ed3634
Merge \\"Fix clang-tidy performance warnings in syste/core.\\" am: 4efbce14b5
...
am: 4c4fa90462
Change-Id: I66bacc66df316cca09afba3ae043bd0a3035da22
2016-08-01 20:25:37 +00:00
Chih-Hung Hsieh
4c4fa90462
Merge \"Fix clang-tidy performance warnings in syste/core.\"
...
am: 4efbce14b5
Change-Id: I84f6b0134fae6e9f40710f243f4825e3f31fa15f
2016-08-01 20:23:10 +00:00
Treehugger Robot
4efbce14b5
Merge "Fix clang-tidy performance warnings in syste/core."
2016-08-01 20:13:54 +00:00
Josh Gao
f551ea0f63
adb: fix stat on Windows.
...
stat on Windows fails with ENOENT when passed a path with a trailing
slash or backslash, regardless of whether the target is actually a
directory. Emulate the correct POSIX behavior by stripping trailing
path separators and then checking if the target is a directory if
successful.
Bug: http://b/30481559
Bug: https://code.google.com/p/android/issues/detail?id=214633
Change-Id: I1d398d19a9bce1ecb3fdc4aabc31aa98c82c3f93
Test: Relevant adb_tests pass on Linux and Windows 10.
2016-08-01 12:36:04 -07:00
Chih-Hung Hsieh
8f7b9e3d39
Fix clang-tidy performance warnings in syste/core.
...
* Use const reference type for parameters to avoid unnecessary copy.
* Suppress warning of not using faster overloaded string find function.
Bug: 30407689
Bug: 30411878
Change-Id: I6cfdbbd50cf5e8f3db6e5263076d3a17a9a791ee
Test: build with WITH_TIDY=1
Merged-In: Ie79dbe21899867bc62031f8618bb1322b8071525
2016-08-01 11:55:42 -07:00
Dan Willemsen
4e09dd8cce
Remove Brillo-specific LOCAL_MODULE_TAGS
...
Replaced with PRODUCT_PACKAGES_ENG in brillo_base.mk
Change-Id: I66f467d95745aa6b1f3c81aa87a3f139a33dbebf
2016-07-31 18:45:14 -07:00
Elliott Hughes
56e22336c8
Merge \\\"libbase should use its own logging!\\\" am: 9f05901b9a
am: 740c4788a0
...
am: 0760b7c6c8
Change-Id: I8e436755a12d51bc133351daef4548d73ac2a3b7
2016-07-30 17:43:58 +00:00
Elliott Hughes
0760b7c6c8
Merge \\"libbase should use its own logging!\\" am: 9f05901b9a
...
am: 740c4788a0
Change-Id: Ieb6deb30665d480f543a6e8d70b888b8facb69d1
2016-07-30 17:42:01 +00:00
Elliott Hughes
740c4788a0
Merge \"libbase should use its own logging!\"
...
am: 9f05901b9a
Change-Id: I2260314d55a179004606a0a13d41249933486e9e
2016-07-30 17:38:59 +00:00
Treehugger Robot
9f05901b9a
Merge "libbase should use its own logging!"
2016-07-30 17:31:37 +00:00
John Stultz
5758078f5e
Merge \\\"sched_policy: Add support for /proc/<tid>/timerslack_ns over PR_SET_TIMERSLACK_PID\\\" am: 817d53493a
am: acf5e849b4
...
am: 304c1264d4
Change-Id: I6055ee00f85e84d1748745415170acfdd0d690ec
2016-07-30 05:29:06 +00:00
Jorge Lucangeli Obes
37ba964283
Fix one last use of TRACE(). am: 8df46540b4
...
am: c44ce4ab2f
Change-Id: Ie9b48e20bf285807fec5e83fff44c0321963388b
2016-07-30 05:29:04 +00:00
John Stultz
304c1264d4
Merge \\"sched_policy: Add support for /proc/<tid>/timerslack_ns over PR_SET_TIMERSLACK_PID\\" am: 817d53493a
...
am: acf5e849b4
Change-Id: I3653682cc758372919d24aa2c463da27f7be3602
2016-07-30 05:24:15 +00:00
Jorge Lucangeli Obes
c44ce4ab2f
Fix one last use of TRACE().
...
am: 8df46540b4
Change-Id: I20cd8f0b6c6aa08388886aec480f2f8309a83a19
2016-07-30 05:24:15 +00:00
John Stultz
acf5e849b4
Merge \"sched_policy: Add support for /proc/<tid>/timerslack_ns over PR_SET_TIMERSLACK_PID\"
...
am: 817d53493a
Change-Id: Iea895b632b3bfa7daae0be34c2cc69563a18a6d5
2016-07-30 05:20:34 +00:00
Treehugger Robot
817d53493a
Merge "sched_policy: Add support for /proc/<tid>/timerslack_ns over PR_SET_TIMERSLACK_PID"
2016-07-29 22:54:36 +00:00
Jorge Lucangeli Obes
8df46540b4
Fix one last use of TRACE().
...
Bug: 30222003
Change-Id: I3d0a29cb92e83416eb6851b54cb72886da4f7cf2
(cherry picked from commit a65f3e1a1f
)
2016-07-29 22:02:41 +00:00
John Stultz
2f13f0a48a
sched_policy: Add support for /proc/<tid>/timerslack_ns over PR_SET_TIMERSLACK_PID
...
The PR_SET_TIMERSLACK_PID number has collided with upstream
changes a number of times, and thus the number is not consistent
between AOSP common kernel versions.
In 4.6+, the upstream kernel added equivalent functionaity via
the /proc/<tid>/timerslack_ns entry.
This patch changes the sched_policy logic to support
/proc/<tid>/timerslack_ns if its available, falling back to the
older PR_SET_TIMERSLACK_PID method if not.
NOTE: Eventually PR_SET_TIMERSLACK_PID usage will need to be
removed as it is likely to conflict with valid future upstream
PR_* entries.
Also add missing O_CLOEXEC to other open calls in this file.
Change-Id: Iec0b8a62de0dc8bdd57b60df82bd4d31c5d64709
Signed-off-by: John Stultz <john.stultz@linaro.org>
2016-07-29 14:30:20 -07:00
James Hawkins
6ba4ee29b3
bootstat: Fix a potential unhandled exception for malformed input. am: f85554e12f
...
am: 09b26cc3f0
Change-Id: Iaa761d1a819b4f470473c2e0800eabe04a6a363b
2016-07-29 17:20:42 +00:00
Chih-Hung Hsieh
cfa32e2d5d
Merge \\\"Fix google-explicit-constructor warnings in system/core.\\\" am: 6dc68cb5f9
am: 89cc78b77f
...
am: e59bc67fa4
Change-Id: I28613acd85ddcbd0b6f285cdfe046b283b49bd83
2016-07-29 17:06:44 +00:00
Amit Pundir
9c23e55189
Merge \\\"init: usb: delete rndis func to unregister n/w interface\\\" am: 060b15e20a
am: 6d287b3de7
...
am: e2f4d9e770
Change-Id: I10e03cad4cb026c86ce5882f6c25829830bf8d9f
2016-07-29 17:06:43 +00:00
Chih-hung Hsieh
e59bc67fa4
Merge \\"Fix google-explicit-constructor warnings in system/core.\\" am: 6dc68cb5f9
...
am: 89cc78b77f
Change-Id: I71cb106685a21a0cd0e49af76bd457889d0b1f13
2016-07-29 17:04:17 +00:00
Amit Pundir
e2f4d9e770
Merge \\"init: usb: delete rndis func to unregister n/w interface\\" am: 060b15e20a
...
am: 6d287b3de7
Change-Id: Ic370ff5cbb1643554fbd3a943f07756ee089478e
2016-07-29 17:04:16 +00:00
James Hawkins
09b26cc3f0
bootstat: Fix a potential unhandled exception for malformed input.
...
am: f85554e12f
Change-Id: Ieef7d6a359370c16e2473b9fe0251ba133cdda71
2016-07-29 17:04:10 +00:00
Chih-Hung Hsieh
89cc78b77f
Merge \"Fix google-explicit-constructor warnings in system/core.\"
...
am: 6dc68cb5f9
Change-Id: I5a010465364b6e14423b19e8c0f9cffa58ee3152
2016-07-29 17:01:17 +00:00
Amit Pundir
6d287b3de7
Merge \"init: usb: delete rndis func to unregister n/w interface\"
...
am: 060b15e20a
Change-Id: I26e6e414f81fdee55fdfeb017ac0c4f5b0941eea
2016-07-29 17:01:15 +00:00
Chih-hung Hsieh
6dc68cb5f9
Merge "Fix google-explicit-constructor warnings in system/core."
2016-07-29 16:57:17 +00:00
Treehugger Robot
060b15e20a
Merge "init: usb: delete rndis func to unregister n/w interface"
2016-07-29 16:47:10 +00:00
Felipe Leme
a5b2331dff
Merge \\"Improved keychord logging.\\" into nyc-mr1-dev am: a6cb3062ff
...
am: 0c8f0e83ed
Change-Id: I446750637b6e2730798fe19bc5827cb8ffa898fe
2016-07-29 16:14:43 +00:00
Felipe Leme
704fe2d628
resolve merge conflicts of 4acdde9
to nyc-mr1-dev-plus-aosp
...
Change-Id: I2ed3041dd979368f149b6fccc84621e56c118db8
2016-07-29 16:12:40 +00:00
James Hawkins
f85554e12f
bootstat: Fix a potential unhandled exception for malformed input.
...
In rare cases the hardware storage on the device may be hosed and return
garbage. Use ParseInt which handles bad input instead of stoi.
BUG: 29334139
Change-Id: I91aedc169df110bea8097775f73dda11def22311
(cherry picked from commit 4dded613b3
)
2016-07-29 08:24:28 -07:00