Commit graph

21313 commits

Author SHA1 Message Date
Mark Salyzyn
c47812a94f Merge "libcutils: abort for invalid fd" am: 76f99770d1
am: 8a0e1c51bd

* commit '8a0e1c51bdf42bcb3f1840173c27b097d106cd60':
  libcutils: abort for invalid fd
2016-02-05 18:15:14 +00:00
Mark Salyzyn
8a0e1c51bd Merge "libcutils: abort for invalid fd"
am: 76f99770d1

* commit '76f99770d12aedab21a9c2ecee82e5874db50bd1':
  libcutils: abort for invalid fd
2016-02-05 18:12:07 +00:00
Mark Salyzyn
76f99770d1 Merge "libcutils: abort for invalid fd" 2016-02-05 18:05:24 +00:00
Mark Salyzyn
a2eba56f98 Merge "init-debug.rc: add runtime mmc max speed property actors" am: 20a6f0ff3b
am: c883cdec82

* commit 'c883cdec825e021007672d3ce9b199589ed2cba6':
  init-debug.rc: add runtime mmc max speed property actors
2016-02-05 17:38:44 +00:00
Mark Salyzyn
c883cdec82 Merge "init-debug.rc: add runtime mmc max speed property actors"
am: 20a6f0ff3b

* commit '20a6f0ff3bf21e2bc82ebfe06357f6225c991ee9':
  init-debug.rc: add runtime mmc max speed property actors
2016-02-05 15:25:14 +00:00
Mark Salyzyn
20a6f0ff3b Merge "init-debug.rc: add runtime mmc max speed property actors" 2016-02-05 15:21:35 +00:00
Christopher Ferris
4029aec8af Merge "Newer kernels added SEGV_BNDERR." am: 14c06e0769
am: 840887053c

* commit '840887053cee03190cbcff42a9629999052828fe':
  Newer kernels added SEGV_BNDERR.
2016-02-05 02:22:25 +00:00
Christopher Ferris
840887053c Merge "Newer kernels added SEGV_BNDERR."
am: 14c06e0769

* commit '14c06e0769817d81f18fcdc41132747ffc158745':
  Newer kernels added SEGV_BNDERR.
2016-02-05 02:20:13 +00:00
Christopher Ferris
14c06e0769 Merge "Newer kernels added SEGV_BNDERR." 2016-02-05 02:08:27 +00:00
Chih-hung Hsieh
e9163e7f39 Merge "Suppress false positive memory leak warnings." am: cfd44ee74f
am: 22ac670f67

* commit '22ac670f6793f743501c72b7b5bcacc015235652':
  Suppress false positive memory leak warnings.
2016-02-05 01:29:13 +00:00
Chih-hung Hsieh
22ac670f67 Merge "Suppress false positive memory leak warnings."
am: cfd44ee74f

* commit 'cfd44ee74f2318565d188ee0b2dd08911519d55e':
  Suppress false positive memory leak warnings.
2016-02-05 01:26:52 +00:00
Chih-hung Hsieh
cfd44ee74f Merge "Suppress false positive memory leak warnings." 2016-02-05 01:21:14 +00:00
Chih-Hung Hsieh
f7e7bd4c3b Suppress false positive memory leak warnings.
Clang static analyzer does not know the transfer of
object ownership to hashmapPut. Use a fake global
pointer variable to trick the analyzer.

BUG: 26955438
Change-Id: Id3ac595fff14e48d28a1147461cd836914857086
2016-02-04 16:38:04 -08:00
Alex Deymo
52e87a6431 Merge "metricsd: Create a brillo::MessageLoop." am: 205cdb8868
am: 9a5588e0cb

* commit '9a5588e0cb56471cd034fd924281cb0ba508db7e':
  metricsd: Create a brillo::MessageLoop.
2016-02-04 23:57:59 +00:00
Alex Deymo
9a5588e0cb Merge "metricsd: Create a brillo::MessageLoop."
am: 205cdb8868

* commit '205cdb88680ce65382e2fa7080b6a6b603146c96':
  metricsd: Create a brillo::MessageLoop.
2016-02-04 23:43:17 +00:00
Alex Deymo
205cdb8868 Merge "metricsd: Create a brillo::MessageLoop." 2016-02-04 23:38:54 +00:00
Jorge Lucangeli Obes
ce67d85339 Merge "Unit tests: Compile only on \'eng\' builds." am: 42a53e0c2a
am: 0995795e1f

* commit '0995795e1f257eca86266ed656fe57a634bc0694':
  Unit tests: Compile only on 'eng' builds.
2016-02-04 22:31:40 +00:00
Jorge Lucangeli Obes
0995795e1f Merge "Unit tests: Compile only on \'eng\' builds."
am: 42a53e0c2a

* commit '42a53e0c2a46ae8ef44849c8bfb023abd00fd1b7':
  Unit tests: Compile only on 'eng' builds.
2016-02-04 22:29:43 +00:00
Jorge Lucangeli Obes
42a53e0c2a Merge "Unit tests: Compile only on 'eng' builds." 2016-02-04 22:24:46 +00:00
Jorge Lucangeli Obes
1e7592c9d5 Unit tests: Compile only on 'eng' builds.
metrics_collector_tests, metricsd_tests.

Bug: 26967770
Change-Id: I6d7e8fb6d3d98ab747d922bfeef05aa344b2179c
2016-02-04 14:17:46 -08:00
Jorge Lucangeli Obes
2c98e128c5 Merge "crash_reporter_tests: Compile only on \'eng\' builds." am: a7d277796f
am: f3cf9b465e

* commit 'f3cf9b465e4720573f631d0257c2ee4e57991093':
  crash_reporter_tests: Compile only on 'eng' builds.
2016-02-04 22:11:28 +00:00
Jorge Lucangeli Obes
f3cf9b465e Merge "crash_reporter_tests: Compile only on \'eng\' builds."
am: a7d277796f

* commit 'a7d277796f3d04d751e54e6e2ecd17ee023f295b':
  crash_reporter_tests: Compile only on 'eng' builds.
2016-02-04 22:07:48 +00:00
Christopher Ferris
5d56e28537 Newer kernels added SEGV_BNDERR.
Bug: 23789423
Change-Id: I6fdce75715edfce179df8c0e6a7205f26341ebd0
2016-02-04 14:07:23 -08:00
Jorge Lucangeli Obes
a7d277796f Merge "crash_reporter_tests: Compile only on 'eng' builds." 2016-02-04 22:00:25 +00:00
Alex Deymo
f1bf9e5fc9 metricsd: Create a brillo::MessageLoop.
brillo::BinderWatcher now requires a brillo::MessageLoop, so this patch
creates a brillo::BaseMessageLoop and passes it when creating the
brillo::BinderWatcher.

Bug: 26356682
TEST=Deployed metricsd to edison-eng.

Change-Id: I6a9e592623faf231205ae44e479bec2b873b8898
2016-02-04 13:56:38 -08:00
Jorge Lucangeli Obes
512d677a5e crash_reporter_tests: Compile only on 'eng' builds.
Bug: 26967770
Change-Id: I2bebd3da5f0d845edec24279c160d9cc62577210
2016-02-04 13:56:25 -08:00
Mark Salyzyn
25bd6270d3 Merge "logcat: build cleanup" am: 9dead6deec
am: 03302be6e9

* commit '03302be6e93ce85a3ad07674f9d36a608ea80440':
  logcat: build cleanup
2016-02-04 21:47:55 +00:00
Mark Salyzyn
03302be6e9 Merge "logcat: build cleanup"
am: 9dead6deec

* commit '9dead6deec6d97214e16ae931900879a797ffea3':
  logcat: build cleanup
2016-02-04 21:45:33 +00:00
Mark Salyzyn
9dead6deec Merge "logcat: build cleanup" 2016-02-04 21:40:16 +00:00
Mark Salyzyn
7864e36751 init-debug.rc: add runtime mmc max speed property actors
persist.mmc.max_read_speed  - KB/s speed cap
persist.mmc.max_write_speed - KB/s speed cap
persist.mmc.cache_size      - MB of high-speed on-device write cache

device default directly to associated /sys/block/mmcblk0/ attributes,
not delivered on "user" builds.

Bug: 26976972
Change-Id: Ic82b9614489b6406ce830d127c85affc9095e256
2016-02-04 13:10:19 -08:00
Mark Salyzyn
5b89b49fc9 logcat: build cleanup
LOCAL_MODULE_TAGS debug encompasses eng

Bug: 26976972
Change-Id: I44b30f2ebb0173b203bf975f01dfead737b4e5bf
2016-02-04 13:10:19 -08:00
Mark Salyzyn
187b93856e Merge "logcatd.rc: only deliver on eng and userdebug" am: 11aebd8c9a
am: 9bc3b93c6a

* commit '9bc3b93c6a88b460908357a8bc65d0b66552c681':
  logcatd.rc: only deliver on eng and userdebug
2016-02-04 20:38:30 +00:00
Mark Salyzyn
9bc3b93c6a Merge "logcatd.rc: only deliver on eng and userdebug"
am: 11aebd8c9a

* commit '11aebd8c9a69bda7eb1ae47263ebd4f879e2b761':
  logcatd.rc: only deliver on eng and userdebug
2016-02-04 20:36:32 +00:00
Mark Salyzyn
11aebd8c9a Merge "logcatd.rc: only deliver on eng and userdebug" 2016-02-04 20:33:20 +00:00
Mark Salyzyn
6de62e52c7 logcatd.rc: only deliver on eng and userdebug
Change-Id: I694d33a041e40fe181d3c2f1c8604765ba29e709
2016-02-04 11:11:52 -08:00
Josh Gao
3a45f945c7 Merge "adb: don\'t append a slash to a path that already ends with one." am: aae1eb2c4f
am: 4b09d2f084

* commit '4b09d2f084dfe2df3314a10c59090be2c97b9a9e':
  adb: don't append a slash to a path that already ends with one.
2016-02-04 02:35:31 +00:00
Elliott Hughes
2b012f2059 Merge "adb: win32: fix start-server to properly display UTF-8 on the console" am: 1617dd4fe9
am: 89df186cda

* commit '89df186cdab8eb21c7610de9a8348b6f050543d7':
  adb: win32: fix start-server to properly display UTF-8 on the console
2016-02-04 02:35:25 +00:00
Elliott Hughes
96e3d1b5c1 Merge "Add support for USB_HVDCP chargers" am: ba3014c914
am: a902887970

* commit 'a9028879707d58f286014c4a6a9c6b53f61c2806':
  Add support for USB_HVDCP chargers
2016-02-04 02:35:19 +00:00
Josh Gao
d8e0108418 Merge "adb: report subprocess creation errors to the client." am: 7aa7a81eb1
am: 046bf3b212

* commit '046bf3b212e9a01c3f2671c208ae3bfc8fdcd62b':
  adb: report subprocess creation errors to the client.
2016-02-04 02:35:12 +00:00
Josh Gao
6832ddbc98 Merge "adb: fix mistaken uses of SendFail in file_sync_service.cpp." am: 2d2185ee09
am: f2610942ef

* commit 'f2610942efca1857c377df4f427ffaa3eefe65e8':
  adb: fix mistaken uses of SendFail in file_sync_service.cpp.
2016-02-04 02:35:06 +00:00
Mark Salyzyn
c92635f9ee Merge "libcutils: ashmem print error message for invalid fd" am: 9c551a1bec
am: ba6523a449

* commit 'ba6523a4496ecb6fa830f70c45a60fbfdd751c8b':
  libcutils: ashmem print error message for invalid fd
2016-02-04 02:34:59 +00:00
Mark Salyzyn
c759eac864 Merge "libcutils: ashmem check fd validity" am: 1a84f47794
am: c1003c78b7

* commit 'c1003c78b7e16d3e0ad78fab304249fd9d0e1e6b':
  libcutils: ashmem check fd validity
2016-02-04 02:34:52 +00:00
Josh Gao
4b09d2f084 Merge "adb: don\'t append a slash to a path that already ends with one."
am: aae1eb2c4f

* commit 'aae1eb2c4f10f3d2c49455eb37c4ae4b38ffa47d':
  adb: don't append a slash to a path that already ends with one.
2016-02-04 00:42:53 +00:00
Josh Gao
aae1eb2c4f Merge "adb: don't append a slash to a path that already ends with one." 2016-02-04 00:36:32 +00:00
Elliott Hughes
89df186cda Merge "adb: win32: fix start-server to properly display UTF-8 on the console"
am: 1617dd4fe9

* commit '1617dd4fe96d8578a808a9cef9e75f763446ff32':
  adb: win32: fix start-server to properly display UTF-8 on the console
2016-02-04 00:31:40 +00:00
Elliott Hughes
1617dd4fe9 Merge "adb: win32: fix start-server to properly display UTF-8 on the console" 2016-02-04 00:26:36 +00:00
Spencer Low
53a0a99fe8 adb: win32: fix start-server to properly display UTF-8 on the console
fwrite() is a macro that maps to adb_fwrite(), which can write UTF-8 to
the console. Use it to write the output that comes from the subprocess
adb server.

To do this, dup the stdout/stderr file descriptor and make a duplicate
FILE* stream, in binary mode (since we're reading raw bytes from the
subprocess), and unbuffered.

Change-Id: I480761bae0bd576dc9e03fa4d31266f4e49635ed
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2016-02-03 16:24:37 -08:00
Josh Gao
323899b6d3 adb: don't append a slash to a path that already ends with one.
Bug: http://b/26964908
Change-Id: I1fbd752fd97f5414a306b46f7bfce3373362f8b3
2016-02-03 16:24:13 -08:00
Elliott Hughes
a902887970 Merge "Add support for USB_HVDCP chargers"
am: ba3014c914

* commit 'ba3014c914eb65911b3bb367a1b8e02705ecf398':
  Add support for USB_HVDCP chargers
2016-02-04 00:12:06 +00:00
Elliott Hughes
ba3014c914 Merge "Add support for USB_HVDCP chargers" 2016-02-04 00:08:33 +00:00