Commit Graph

16185 Commits

Author SHA1 Message Date
Nick Kralevich ba03cc953f am 5f3b05ad: Merge "init.rc: mkdir /data/anr 0775 system system"
* commit '5f3b05ad14db2a4ebc9eb25567bc951d465b3151':
  init.rc: mkdir /data/anr 0775 system system
2015-07-26 04:39:27 +00:00
Nick Kralevich 5f3b05ad14 Merge "init.rc: mkdir /data/anr 0775 system system" 2015-07-26 04:25:44 +00:00
Nick Kralevich c2ea70ae6e init.rc: mkdir /data/anr 0775 system system
Ensure that /data/anr always exists. This allows us to eliminate
some code in system_server and dumpstate. In addition, this change
solves a common problem where people would create the directory
manually but fail to set the SELinux label, which would cause
subsequent failures when they used the directory for ANRs.

Bug: 22385254
Change-Id: I29eb3deb21a0504aed07570fee3c2f87e41f53a0
2015-07-25 21:06:20 -07:00
Jeff Vander Stoep 552f23deef am 1d0fe13a: am 3f62a020: logd: allow logd to write to /dev/cpuset files
* commit '1d0fe13a9e720a88766b38070195670183274e30':
  logd: allow logd to write to /dev/cpuset files
2015-07-25 16:38:32 +00:00
Elliott Hughes 919bb66f73 Fix libcutils build.
Change-Id: I4df2065f60f5363877809161298c1f9718252934
(cherry picked from commit 8a8953bb3d)
2015-07-25 04:06:57 +00:00
Elliott Hughes 3bbe09a8c6 am 12d912bc: am ed217967: Merge "Fix socket_network_client_timeout error check."
* commit '12d912bc4facd9490becd9d1306a54fd079a8800':
  Fix socket_network_client_timeout error check.
2015-07-25 03:14:44 +00:00
Elliott Hughes 437d698257 resolved conflicts for merge of 038b76c2 to mnc-dr-dev-plus-aosp
Change-Id: I5041d5ac2f377adfeaa6138db47359f1a47fffc7
2015-07-24 20:12:02 -07:00
Yabin Cui 9b09bf4aed am 10821da3: am 8a502000: Merge "init: expand_props for onrestart commands."
* commit '10821da3221ce4fe021c80956a5cac733c97ebb9':
  init: expand_props for onrestart commands.
2015-07-25 02:15:19 +00:00
Elliott Hughes 12d912bc4f am ed217967: Merge "Fix socket_network_client_timeout error check."
* commit 'ed21796754c4879bedaa1a479ae288dda6dad478':
  Fix socket_network_client_timeout error check.
2015-07-25 02:13:39 +00:00
Elliott Hughes 038b76c23e am bb4370f8: Merge "Turn on warnings for libcutils, fix a bug."
* commit 'bb4370f833a661033184d258892906d63a347571':
  Turn on warnings for libcutils, fix a bug.
2015-07-25 02:01:34 +00:00
Yabin Cui 10821da322 am 8a502000: Merge "init: expand_props for onrestart commands."
* commit '8a502000d15cce102569d3609e24846ef19a4a77':
  init: expand_props for onrestart commands.
2015-07-25 02:01:32 +00:00
Elliott Hughes ed21796754 Merge "Fix socket_network_client_timeout error check." 2015-07-25 01:58:57 +00:00
Elliott Hughes bb4370f833 Merge "Turn on warnings for libcutils, fix a bug." 2015-07-25 01:56:24 +00:00
Elliott Hughes eabe8af7e3 Fix socket_network_client_timeout error check.
Change-Id: Ia30ffc1a7815c63d247d9ba298c2fe9d7a780af2
2015-07-24 18:54:02 -07:00
Yabin Cui 8a502000d1 Merge "init: expand_props for onrestart commands." 2015-07-25 01:49:01 +00:00
Elliott Hughes 8fea1ede67 Turn on warnings for libcutils, fix a bug.
This doesn't actually spot the bug I'm about to fix, but maybe one day...

Change-Id: Ib8a2016ecd8a426f38960a05d439646255ea6cd8
2015-07-24 18:48:31 -07:00
Yabin Cui 310851549b am bd5f10ad: am 699be5f6: Merge "init: do expand_props before calling the builtins."
* commit 'bd5f10addfba8df40c8293d95c002044acbfa526':
  init: do expand_props before calling the builtins.
2015-07-25 01:19:29 +00:00
Yabin Cui ee53006564 init: expand_props for onrestart commands.
It is only a temporary fix. I hope the code can be moved into a member
function of class Command.

Bug: 22654233
Change-Id: I38c24fb624e54986a953f44d398b3b80c3795d24
2015-07-24 18:17:16 -07:00
Yabin Cui bd5f10addf am 699be5f6: Merge "init: do expand_props before calling the builtins."
* commit '699be5f66950d0767cb6d9e1190ecd6932a4c7bb':
  init: do expand_props before calling the builtins.
2015-07-25 01:05:25 +00:00
Elliott Hughes 727f40ebda am b8fa711f: am 3fe6de1c: Merge "Add a simple test for using non-ASCII paths with adb."
* commit 'b8fa711fa92791f67592d9b9730354b1dd9e78e5':
  Add a simple test for using non-ASCII paths with adb.
2015-07-25 01:03:24 +00:00
Jeff Vander Stoep 1d0fe13a9e am 3f62a020: logd: allow logd to write to /dev/cpuset files
* commit '3f62a020c48d5d812fb2898759b93a59dc24d310':
  logd: allow logd to write to /dev/cpuset files
2015-07-25 00:59:33 +00:00
Yabin Cui 699be5f669 Merge "init: do expand_props before calling the builtins." 2015-07-25 00:54:21 +00:00
Elliott Hughes b8fa711fa9 am 3fe6de1c: Merge "Add a simple test for using non-ASCII paths with adb."
* commit '3fe6de1c39f532d4f462da8acbb3d2e84ee1a053':
  Add a simple test for using non-ASCII paths with adb.
2015-07-24 23:22:35 +00:00
Elliott Hughes 3fe6de1c39 Merge "Add a simple test for using non-ASCII paths with adb." 2015-07-24 23:07:56 +00:00
Elliott Hughes 614e0a47d3 Add a simple test for using non-ASCII paths with adb.
Bug: https://code.google.com/p/android/issues/detail?id=8185
Change-Id: If28a0ff345f44b60d6651bb36afb0bf72fe55e16
2015-07-24 15:26:46 -07:00
Elliott Hughes 6281dbcd11 am 7d86f5e5: am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)."
* commit '7d86f5e527c01d3fda84575af98888ee117159ee':
  Fix Win32 adb build (for the second time today).
2015-07-24 22:04:19 +00:00
Yabin Cui 00ede7d262 init: do expand_props before calling the builtins.
Also switch expand_props to std::string.

Bug: 22654233

Change-Id: I62910d4f74e2b1a5bd2b14aea440767a2a8462b7
2015-07-24 15:02:19 -07:00
Elliott Hughes 7d86f5e527 am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)."
* commit '239f6ac8e73e294eaf21ec70a9f2f7a3631ab964':
  Fix Win32 adb build (for the second time today).
2015-07-24 21:47:49 +00:00
Elliott Hughes 239f6ac8e7 Merge "Fix Win32 adb build (for the second time today)." 2015-07-24 21:34:17 +00:00
Elliott Hughes 4f1d7b55d7 Fix Win32 adb build (for the second time today).
Change-Id: I83cb407660cd8b5ed65a80574875fe261e8a8926
2015-07-24 14:32:46 -07:00
Elliott Hughes c53ef014e5 am f077e45c: am 9dad4ec4: Merge "Clean up the locking in usb_linux.cpp."
* commit 'f077e45cc47d1bf16779f3a689bd0cd857cb7f03':
  Clean up the locking in usb_linux.cpp.
2015-07-24 21:11:11 +00:00
Elliott Hughes 0ddd9b2143 am 51d08e8e: am 2e942a47: Merge "Fix Win32 adb build."
* commit '51d08e8e7abe50051650b1ea5936006c6d6da3e9':
  Fix Win32 adb build.
2015-07-24 21:10:48 +00:00
Yabin Cui 0ff8590e78 resolved conflicts for merge of bff40697 to mnc-dr-dev-plus-aosp
Change-Id: I7d7a614a5eb987ef6aecd32ed15a6eaa43e93957
2015-07-24 13:58:03 -07:00
Elliott Hughes f077e45cc4 am 9dad4ec4: Merge "Clean up the locking in usb_linux.cpp."
* commit '9dad4ec4408bf412c265ac9bb27c84bb5098e67c':
  Clean up the locking in usb_linux.cpp.
2015-07-24 20:37:12 +00:00
Elliott Hughes 9dad4ec440 Merge "Clean up the locking in usb_linux.cpp." 2015-07-24 20:21:53 +00:00
Elliott Hughes 812f030477 Clean up the locking in usb_linux.cpp.
tsan complained that usb_bulk_write accesses usb_handle members outside
a lock. Fix that, but by moving everything over to C++11 locking.

Note that the old code was checking whether pthread_cond_timedwait returned
a negative value, which it will never do --- it will signal timeout (or
any other error) by returning a positive errno value. The rewrite does
what they appeared to intend to do (break out on timeout), rather than
what they actually did (keep trying forever).

Bug: http://b/22598587
Change-Id: Iab6869ffed4874143a7da97193d6b09e34cf2933
2015-07-24 12:35:50 -07:00
Elliott Hughes 51d08e8e7a am 2e942a47: Merge "Fix Win32 adb build."
* commit '2e942a47967ad302db15b3f7f17cf17f28785d16':
  Fix Win32 adb build.
2015-07-24 18:50:30 +00:00
Elliott Hughes 2e942a4796 Merge "Fix Win32 adb build." 2015-07-24 18:36:56 +00:00
Elliott Hughes d48dbd89c8 Fix Win32 adb build.
Change-Id: I0a07379c470b7fa7f9bdef68c17ccb7bd0bd2079
2015-07-24 11:35:40 -07:00
Yabin Cui bff406978a am addf7a96: Merge "init: Let property_get return std::string."
* commit 'addf7a964b5b17c00e5e371e2d0ed42eb5e563e1':
  init: Let property_get return std::string.
2015-07-24 18:26:51 +00:00
Yabin Cui addf7a964b Merge "init: Let property_get return std::string." 2015-07-24 18:16:06 +00:00
Yabin Cui 74edcea90e init: Let property_get return std::string.
Bug: 22654233

Change-Id: Id6091f58432f75e966b9871256049fbe17766c10
2015-07-24 11:14:08 -07:00
Elliott Hughes 470df782f4 am 1f76c1ab: am 9727a6a0: Merge "Report getaddrinfo failures correctly."
* commit '1f76c1abea3196a61f85164a078d44505d3a6b5e':
  Report getaddrinfo failures correctly.
2015-07-24 17:42:55 +00:00
Elliott Hughes 1f76c1abea am 9727a6a0: Merge "Report getaddrinfo failures correctly."
* commit '9727a6a01942551af248563535196e6d722eb186':
  Report getaddrinfo failures correctly.
2015-07-24 17:27:47 +00:00
Elliott Hughes 9727a6a019 Merge "Report getaddrinfo failures correctly." 2015-07-24 17:18:47 +00:00
Jeff Vander Stoep 3f62a020c4 logd: allow logd to write to /dev/cpuset files
Required by logd on devices with USE_CPUSETS defined.

Make /dev/cpuset/background, /dev/cpuset/foreground and
/dev/cpuset/task writeable by system gid. Add logd to system
group for writing to cpuset files and to root group to avoid
regressions. When dropping privs, also drop supplementary groups.

Bug: 22699101
Change-Id: Icc01769b18b5e1f1649623da8325a8bfabc3a3f0
2015-07-24 16:22:06 +00:00
Elliott Hughes 381cfa9a8b Report getaddrinfo failures correctly.
Also move us off the "convenience" function because you can't get useful
error reporting from it.

Change-Id: I5fcc6a6d762f5f60906980a7835f01a35045be65
2015-07-23 21:14:38 -07:00
Elliott Hughes 646732eb94 am f5defe75: am 89cc750e: Merge "Don\'t limit Windows USB reads."
* commit 'f5defe752334c557a6be2d7242c944a81f11be76':
  Don't limit Windows USB reads.
2015-07-23 19:10:09 +00:00
Elliott Hughes 819f022181 am 2fc8a91e: am 6b40d0aa: Merge "adb: win32: fix exec-in and exec-out to use binary mode"
* commit '2fc8a91eb35556b6f2bb4018b0fe2c08de55fe1c':
  adb: win32: fix exec-in and exec-out to use binary mode
2015-07-23 19:10:07 +00:00
Elliott Hughes 335321e7c1 am d804c6cd: am 571c8d71: Merge "Increase size of the the adb packets sent over the wire"
* commit 'd804c6cdc5f0dd4bccfe802f3e4db12e9110e0ef':
  Increase size of the the adb packets sent over the wire
2015-07-23 19:10:05 +00:00