Commit graph

23181 commits

Author SHA1 Message Date
Chih-hung Hsieh
d581f2c47d Merge "Fix misc-macro-parentheses warnings in liblog." am: 2bd428e1f9
am: 1cff850bb3

* commit '1cff850bb383d75c395d4627086b6baa63639a18':
  Fix misc-macro-parentheses warnings in liblog.

Change-Id: I318ab4909ba59e7181b9ec9c3e73f58ea8b0c0d8
2016-05-19 01:02:34 +00:00
Chih-hung Hsieh
446dcb4625 Merge "Fix misc-macro-parentheses warnings in libion, libsparse, libmem*" am: 3e3741aa7f
am: e98251ed61

* commit 'e98251ed61de2e68f0254e3cac249d21394bd893':
  Fix misc-macro-parentheses warnings in libion, libsparse, libmem*

Change-Id: If2f2b291e493d4e5bcde017d88499adac27ad38f
2016-05-19 01:02:33 +00:00
Chih-Hung Hsieh
1cff850bb3 Merge "Fix misc-macro-parentheses warnings in liblog."
am: 2bd428e1f9

* commit '2bd428e1f9c2fb4459b37b3bda95143319d78728':
  Fix misc-macro-parentheses warnings in liblog.

Change-Id: I045e4f16264c39316456cd1e5c9b3df869c5701b
2016-05-19 00:59:57 +00:00
Chih-Hung Hsieh
e98251ed61 Merge "Fix misc-macro-parentheses warnings in libion, libsparse, libmem*"
am: 3e3741aa7f

* commit '3e3741aa7fd414272a3c9c244e56e663dfa7ad1c':
  Fix misc-macro-parentheses warnings in libion, libsparse, libmem*

Change-Id: I01af8be27569a2b8c1f85e468fdb1d6ebbb23e93
2016-05-19 00:59:56 +00:00
Chih-hung Hsieh
2bd428e1f9 Merge "Fix misc-macro-parentheses warnings in liblog." 2016-05-19 00:48:44 +00:00
Chih-hung Hsieh
3e3741aa7f Merge "Fix misc-macro-parentheses warnings in libion, libsparse, libmem*" 2016-05-19 00:48:32 +00:00
Josh Gao
a41a0c2acc Merge "adb: use asocket\'s close function when closing." am: 684d543922
am: 43c058e51a

* commit '43c058e51a652874cfdf0c687ba1dee18f13f993':
  adb: use asocket's close function when closing.

Change-Id: I0681ff8c31c2f221e246a86857fbff779d2b7dcf
2016-05-19 00:16:11 +00:00
Josh Gao
43c058e51a Merge "adb: use asocket\'s close function when closing."
am: 684d543922

* commit '684d543922465538dd233c99c0cf492f1f24233c':
  adb: use asocket's close function when closing.

Change-Id: Icb05f95c2cb16800dd114f52e6f301dae72ad654
2016-05-19 00:13:12 +00:00
Treehugger Robot
684d543922 Merge "adb: use asocket's close function when closing." 2016-05-19 00:11:03 +00:00
Chih-Hung Hsieh
dccd3a3698 Merge "Fix misc-macro-parentheses warnings in adb, debuggerd, libbacktrace." am: dab7d9de03
am: fa7569c921

* commit 'fa7569c921b9ca0db894287ea826cbd3b041d880':
  Fix misc-macro-parentheses warnings in adb, debuggerd, libbacktrace.

Change-Id: I63223e36f3627d312051c86d54919b6cef33766c
2016-05-19 00:05:39 +00:00
Chih-Hung Hsieh
fa7569c921 Merge "Fix misc-macro-parentheses warnings in adb, debuggerd, libbacktrace."
am: dab7d9de03

* commit 'dab7d9de03369feeb099be6c8f7748df3f466bd3':
  Fix misc-macro-parentheses warnings in adb, debuggerd, libbacktrace.

Change-Id: I6fc423fc3eb08c6e44a3d7261ae0e1b87ce0e993
2016-05-19 00:02:55 +00:00
Treehugger Robot
dab7d9de03 Merge "Fix misc-macro-parentheses warnings in adb, debuggerd, libbacktrace." 2016-05-18 23:54:40 +00:00
Josh Gao
ebb08fb9a6 Merge changes I5e56f17f,Ie3748b6c,I4e1d56a8 am: cea14958d2
am: 71c062f40a

* commit '71c062f40ac9ac5175f55bce03ce0cb8eb540710':
  adb: switch the socket list mutex to a recursive_mutex.
  adb: clang-format sockets.cpp.
  adb: add implementations of mutex, recursive_mutex.

Change-Id: Icd8a74f1052f7b4c4616ddf23b65c7208195202c
2016-05-18 23:22:47 +00:00
Josh Gao
71c062f40a Merge changes I5e56f17f,Ie3748b6c,I4e1d56a8
am: cea14958d2

* commit 'cea14958d2903f136f8874238ccff4da1b0d38d9':
  adb: switch the socket list mutex to a recursive_mutex.
  adb: clang-format sockets.cpp.
  adb: add implementations of mutex, recursive_mutex.

Change-Id: I8ec365c99dbc1dc402d62a8401df937ae6ae3a6b
2016-05-18 23:19:42 +00:00
Treehugger Robot
cea14958d2 Merge changes I5e56f17f,Ie3748b6c,I4e1d56a8
* changes:
  adb: switch the socket list mutex to a recursive_mutex.
  adb: clang-format sockets.cpp.
  adb: add implementations of mutex, recursive_mutex.
2016-05-18 23:14:42 +00:00
Chih-Hung Hsieh
67867dbd79 Fix misc-macro-parentheses warnings in adb, debuggerd, libbacktrace.
Bug: 28705665
Change-Id: I469b2a882f6d1f399bfc22c75a26da245991fc33
2016-05-18 15:53:15 -07:00
Chih-Hung Hsieh
f0f94fe49b Fix misc-macro-parentheses warnings in liblog.
Bug: 28705665
Change-Id: Ib272a83cb93b09d986c19a40e23a2679b9e17558
2016-05-18 15:48:50 -07:00
Chih-Hung Hsieh
eabd5108b3 Fix misc-macro-parentheses warnings in libion, libsparse, libmem*
Bug: 28705665
Change-Id: I3dd5c086787f5e48ab100a71a42109ea0e417bf9
2016-05-18 15:41:16 -07:00
Josh Gao
53eb31d87c adb: use asocket's close function when closing.
close_all_sockets was assuming that all registered local sockets used
local_socket_close as their close function. However, this is not true
for JDWP sockets.

Bug: http://b/28347842
Change-Id: I40a1174845cd33f15f30ce70828a7081cd5a087e
2016-05-18 14:21:53 -07:00
Josh Gao
9b587dec6d adb: switch the socket list mutex to a recursive_mutex.
sockets.cpp was branching on whether a socket close function was
local_socket_close in order to avoid a potential deadlock if the socket
list lock was held while closing a peer socket.

Bug: http://b/28347842
Change-Id: I5e56f17fa54275284787f0f1dc150d1960256ab3
2016-05-18 14:21:53 -07:00
Josh Gao
52bd8526aa adb: clang-format sockets.cpp.
Bug: http://b/28347842
Change-Id: Ie3748b6c803d4e8056e9d7abd065a8b99d945a5b
2016-05-18 14:21:53 -07:00
Josh Gao
903b749f78 adb: add implementations of mutex, recursive_mutex.
Our version of mingw doesn't support std::mutex or
std::recursive_mutex, so implement our own using the Windows primitives.

Bug: http://b/28347842
Change-Id: I4e1d56a89bc5fcb5f859bf5014343697a4a85b77
2016-05-18 14:21:53 -07:00
Mark Salyzyn
5d32a9821d Merge "liblog: log reader validate headers" am: 0321476fe2
am: 0a7dec432c

* commit '0a7dec432ce3a72edcf5bf092871296225cd814b':
  liblog: log reader validate headers

Change-Id: Ic035cf9d3e765e95799a25c1441d5fa88ab3fda7
2016-05-18 14:27:54 +00:00
Mark Salyzyn
0a7dec432c Merge "liblog: log reader validate headers"
am: 0321476fe2

* commit '0321476fe2aedf9a0b960508b52681ee5f1d555e':
  liblog: log reader validate headers

Change-Id: I21832a3908161e489a04a127508e2339e7f29bce
2016-05-18 14:25:26 +00:00
Mark Salyzyn
0321476fe2 Merge "liblog: log reader validate headers" 2016-05-18 14:19:04 +00:00
Dimitry Ivanov
84b1a67048 Set parent namespace for linker-namespaces
am: ade364b456

* commit 'ade364b4566212a0c16920443a84aa85ac31f781':
  Set parent namespace for linker-namespaces

Change-Id: I91b0a79d30d6afb8f47ee66ce85351c7fb8ae82c
2016-05-18 07:40:07 +00:00
Dimitry Ivanov
e17c2efc4c Merge "Set parent namespace for linker-namespaces" am: ac50d0cc57
am: 3457aba394

* commit '3457aba39480e85d582dd6890c4c72e418958782':
  Set parent namespace for linker-namespaces

Change-Id: I20ea9239e95377894f477c33cf65bc7da7ad1e5a
2016-05-17 23:06:21 +00:00
Josh Gao
666d9aa507 Merge "adb: replace failing exits in adbd with abort()." am: eb62619ff9
am: 4e1149bb15

* commit '4e1149bb152829a016873bbc7795646b5ff5f384':
  adb: replace failing exits in adbd with abort().

Change-Id: I78b30130181d09a7755a48c6b769e33def622f7b
2016-05-17 23:06:17 +00:00
Josh Gao
1209092769 Merge "adb: add track-jdwp and track-devices commands." am: f8f40a1e2e
am: 32045567be

* commit '32045567be1f5af449dfa16173f16b70ae34e85b':
  adb: add track-jdwp and track-devices commands.

Change-Id: I60e9899b403fa68e3037aed3a4bce498c66c6c7d
2016-05-17 23:06:15 +00:00
Dimitry Ivanov
ade364b456 Set parent namespace for linker-namespaces
This change allows applications to share RTLD_GLOBAL
native libraries between namespaces associated with
different classloaders.

The rule is - if a library is GLOBAL within namespace
associated with parent classloader, it is shared
with namespace associated with this classloader

Note that the sharing happens on create_namespace
event, which is tied to createClassloader in case of
application classloaders created by the framework, for
custom application classloaders it is tied to first
loadLibrary() event.

Bug: http://b/28560538
Bug: https://code.google.com/p/android/issues/detail?id=208458
Change-Id: I7ee701166f8ec5eff033b7acc0f80c7aa4ec5bda
(cherry picked from commit 24db75c1ce)
2016-05-17 15:58:56 -07:00
Dimitry Ivanov
3457aba394 Merge "Set parent namespace for linker-namespaces"
am: ac50d0cc57

* commit 'ac50d0cc5789d8462fcd2d9f6cb225e0edf9a12f':
  Set parent namespace for linker-namespaces

Change-Id: I832b3f228873e93a8b9a00e365af561f10b41eb2
2016-05-17 22:58:45 +00:00
Josh Gao
4e1149bb15 Merge "adb: replace failing exits in adbd with abort()."
am: eb62619ff9

* commit 'eb62619ff9211ecee2a5c6ce4475b7d6baf9cb0e':
  adb: replace failing exits in adbd with abort().

Change-Id: I6b5b5b61c18b6afb2e1e96cab6ba8704d9115bcc
2016-05-17 22:58:38 +00:00
Josh Gao
32045567be Merge "adb: add track-jdwp and track-devices commands."
am: f8f40a1e2e

* commit 'f8f40a1e2e6162b7f334f83a10f6a5d9ef44f75f':
  adb: add track-jdwp and track-devices commands.

Change-Id: I96e185b1235aaa2c82371a53415fa44c57444dac
2016-05-17 22:58:34 +00:00
Treehugger Robot
ac50d0cc57 Merge "Set parent namespace for linker-namespaces" 2016-05-17 22:43:01 +00:00
Josh Gao
eb62619ff9 Merge "adb: replace failing exits in adbd with abort()." 2016-05-17 22:33:44 +00:00
Josh Gao
f8f40a1e2e Merge "adb: add track-jdwp and track-devices commands." 2016-05-17 22:33:30 +00:00
Mark Salyzyn
8fd1faa596 liblog: log reader validate headers
Ensure len and hdr_size fields are valid and match the return value.
Truncate or zero content as necessary, but do not drop the message.

Bug: 28610769
Change-Id: I10785fa5b03aa3da7d07b368188e3f7c36a84b4f
2016-05-17 13:54:42 -07:00
Ruchi Kandoi
4b4411e832 healthd: Check if battery device exists instead of charger drivers before setting fake properties. am: 9cb3d3ccf4 am: f2ca669e80
am: 6e394f0f6c

* commit '6e394f0f6c693e6f05def66d0427abd385b3f798':
  healthd: Check if battery device exists instead of charger drivers before setting fake properties.

Change-Id: I7a1f57d749f8460b57c0cbca7bbe87da4ee5a64d
2016-05-17 18:35:42 +00:00
Ruchi Kandoi
6e394f0f6c healthd: Check if battery device exists instead of charger drivers before setting fake properties. am: 9cb3d3ccf4
am: f2ca669e80

* commit 'f2ca669e80078254ad3aceac800161b3266d3195':
  healthd: Check if battery device exists instead of charger drivers before setting fake properties.

Change-Id: I8115836dbd81264634dd7ab84bc360ac610a030b
2016-05-17 18:23:04 +00:00
Ruchi Kandoi
f2ca669e80 healthd: Check if battery device exists instead of charger drivers before setting fake properties.
am: 9cb3d3ccf4

* commit '9cb3d3ccf49bf0fd484563fbf611c68789d5b8a9':
  healthd: Check if battery device exists instead of charger drivers before setting fake properties.

Change-Id: I521f7a7d097da915e40a273d73a655aa01ea397e
2016-05-17 18:20:14 +00:00
Michael Wright
30a1db7045 Merge "Fix strstr16." into nyc-dev
am: a34a383607

* commit 'a34a383607007d632878929c6c9278221242d457':
  Fix strstr16.

Change-Id: I8fa1fab977f974c861cecb8b24b72cd175c27752
2016-05-17 17:28:02 +00:00
Michael Wright
a34a383607 Merge "Fix strstr16." into nyc-dev 2016-05-17 17:18:49 +00:00
Elliott Hughes
8161406c59 Merge "Don\'t include <machine/cpu-features.h>." am: 9b0eb7cdf4
am: e2c741ce0f

* commit 'e2c741ce0fa6e956bf0c70e5b132d4f62fb44738':
  Don't include <machine/cpu-features.h>.

Change-Id: Ib31e7262da17dfad7a50172d1ebd2735d6090338
2016-05-17 04:08:46 +00:00
Dimitry Ivanov
d05e902aaf Merge "Pass permitted_path to the linker as is." am: a214a769f9
am: f7d2b8276a

* commit 'f7d2b8276ad3020c9f5c8accf26ba78e2e1a05c1':
  Pass permitted_path to the linker as is.

Change-Id: I9c8db389290e71893cfb23efee296e68e084f388
2016-05-17 04:08:46 +00:00
Dimitry Ivanov
d98683f415 Pass permitted_path to the linker as is.
am: 25df4bff44

* commit '25df4bff44a0d1a342dc45521bf7e860b3fef947':
  Pass permitted_path to the linker as is.

Change-Id: Idf8459267f8e1cc7bebc9a55b1272871b3d8119a
2016-05-17 04:06:05 +00:00
Elliott Hughes
e2c741ce0f Merge "Don\'t include <machine/cpu-features.h>."
am: 9b0eb7cdf4

* commit '9b0eb7cdf4ac4650fc3f476c2f5a91c50a18e524':
  Don't include <machine/cpu-features.h>.

Change-Id: Ie2b744b8dc414b7dc8568dae77eeb3babf7df3a8
2016-05-17 03:13:07 +00:00
Elliott Hughes
9b0eb7cdf4 Merge "Don't include <machine/cpu-features.h>." 2016-05-17 03:10:05 +00:00
Dimitry Ivanov
24db75c1ce Set parent namespace for linker-namespaces
This change allows applications to share RTLD_GLOBAL
native libraries between namespaces associated with
different classloaders.

The rule is - if a library is GLOBAL within namespace
associated with parent classloader, it is shared
with namespace associated with this classloader

Note that the sharing happens on create_namespace
event, which is tied to createClassloader in case of
application classloaders created by the framework, for
custom application classloaders it is tied to first
loadLibrary() event.

Bug: http://b/28560538
Bug: https://code.google.com/p/android/issues/detail?id=208458
Change-Id: I7ee701166f8ec5eff033b7acc0f80c7aa4ec5bda
2016-05-16 18:13:49 -07:00
Dimitry Ivanov
f7d2b8276a Merge "Pass permitted_path to the linker as is."
am: a214a769f9

* commit 'a214a769f9a98b0962e62bd716575a05cf6f9f59':
  Pass permitted_path to the linker as is.

Change-Id: Ic4d8e6a67ca069319d872e6f3dcb76e857162093
2016-05-17 01:13:29 +00:00
Dimitry Ivanov
25df4bff44 Pass permitted_path to the linker as is.
Now that we have the fixed list of whitelisted libraries
there is no longer need to check if java_permitted_path is nullptr.
In fact checking it prevents custom classloaders created by apps
from loading libraries using absolute path.

Bug: http://b/28659864
Change-Id: I1bfc16a573b090f70f078ecccd0e4016939a5dc0
(cherry picked from commit b31caa95ec)
2016-05-16 18:09:15 -07:00