Commit graph

27052 commits

Author SHA1 Message Date
Mark Salyzyn
332200bce7 Merge "liblog: Add private interfaces for buffer size properties" am: 094004bf42 am: 8806766621
am: eb980356fe

Change-Id: Ic0d4f248bc4ba6e6e4c1fca3b88891055e4414f9
2016-10-18 23:43:38 +00:00
Mark Salyzyn
eb980356fe Merge "liblog: Add private interfaces for buffer size properties" am: 094004bf42
am: 8806766621

Change-Id: I99f9632892f2afa34d124d9f8366fc1a0b13fc09
2016-10-18 23:36:29 +00:00
Mark Salyzyn
8806766621 Merge "liblog: Add private interfaces for buffer size properties"
am: 094004bf42

Change-Id: I81c6ff947b0f0939b41ea59dae153c5584ac9049
2016-10-18 23:29:28 +00:00
Mark Salyzyn
094004bf42 Merge "liblog: Add private interfaces for buffer size properties" 2016-10-18 23:22:18 +00:00
Tao Bao
2926619d8a Merge "init: use libbootloader_message." am: 5062b87eba am: 95bcd98021
am: bd65874a9e

Change-Id: Ie9608aa8b53f18ab883ba72bbe5a568242ae1602
2016-10-18 23:08:20 +00:00
Tao Bao
bd65874a9e Merge "init: use libbootloader_message." am: 5062b87eba
am: 95bcd98021

Change-Id: I06703adf39daaf16a14d6ad7ffaea4f1a02eae28
2016-10-18 23:01:09 +00:00
Tao Bao
95bcd98021 Merge "init: use libbootloader_message."
am: 5062b87eba

Change-Id: I413cc62aa7dbfba1950e187fdfa59a79c1048dc1
2016-10-18 22:54:28 +00:00
Tianjie Xu
769c601b91 resolve merge conflicts of 34486c5 to master
Change-Id: I12fc8eb4760bd6c4ae5c97583eb6c659122c9fa9
2016-10-18 15:46:56 -07:00
Tianjie Xu
34486c5d2b Merge "Add functions in recovery/minzip to libziparchive" am: 4bc51d1ea4
am: b2ca85184b

Change-Id: Iabe3e2e2f02e3d6f6325c929684e64db09063c1f
2016-10-18 22:05:34 +00:00
Tianjie Xu
b2ca85184b Merge "Add functions in recovery/minzip to libziparchive"
am: 4bc51d1ea4

Change-Id: Ica94e8050286bed1c5bc23a33305050ab8da8ec5
2016-10-18 21:57:30 +00:00
Tao Bao
5062b87eba Merge "init: use libbootloader_message." 2016-10-18 21:48:23 +00:00
Tim Murray
7293ebd4de Merge "Revert "libsuspend: move to exponential backoff"" into nyc-mr1-dev am: bfec148834 am: 1a3e744d18
am: cbfcd65d9e

Change-Id: I0777502c7949e71ec8eac63449734742bec1ee2c
2016-10-18 18:59:26 +00:00
Tim Murray
5b88df2867 Revert "libsuspend: move to exponential backoff" am: 23c8bab024 am: 4dcd461945
am: 274359228c

Change-Id: I39ebef48d9a993aec70ffbf554bb50ddfb99f16c
2016-10-18 18:59:13 +00:00
Tim Murray
cbfcd65d9e Merge "Revert "libsuspend: move to exponential backoff"" into nyc-mr1-dev am: bfec148834
am: 1a3e744d18

Change-Id: I305a3a3ee9c4e2176668d779b152cf830114cb72
2016-10-18 18:53:06 +00:00
Tim Murray
274359228c Revert "libsuspend: move to exponential backoff" am: 23c8bab024
am: 4dcd461945

Change-Id: Ie1087acf944c43ab2c4f02a63817563d6125393f
2016-10-18 18:52:09 +00:00
Tim Murray
1a3e744d18 Merge "Revert "libsuspend: move to exponential backoff"" into nyc-mr1-dev
am: bfec148834

Change-Id: If248d128e6e07915417f51a646a3d7dc11c20bca
2016-10-18 18:43:36 +00:00
Tim Murray
4dcd461945 Revert "libsuspend: move to exponential backoff"
am: 23c8bab024

Change-Id: I07decd5946c8877308b8ee9d2b49536fcabf548c
2016-10-18 18:40:48 +00:00
Yabin Cui
1051e107f2 init: use libbootloader_message.
Bug: 29582118
Change-Id: I6285b29774a11d6dda8496c7c73e4c1d17a672bd
(cherry picked from commit 0b1252cca0)
2016-10-18 11:37:52 -07:00
Tim Murray
bfec148834 Merge "Revert "libsuspend: move to exponential backoff"" into nyc-mr1-dev 2016-10-18 18:32:16 +00:00
Tianjie Xu
4bc51d1ea4 Merge "Add functions in recovery/minzip to libziparchive" 2016-10-18 17:30:02 +00:00
Tim Murray
23c8bab024 Revert "libsuspend: move to exponential backoff"
This reverts commit fb896944b6.

bug 32180327

Change-Id: Ic26bdffac6c56b102348f5393e6eb5d895960d7e
2016-10-18 17:05:59 +00:00
Mark Salyzyn
0e52f4e8a3 Merge changes Ibf4774f7,I6568eea0,I35e83679,I9faf8826,I8ee9d999 am: c1f74ca5aa am: 84dafd104b
am: 61d28ddedf

Change-Id: Iae358de19ecd8c1c12e0623139eb44a172452b0b
2016-10-18 17:00:33 +00:00
Mark Salyzyn
01a5d03af0 fs_mgr: use __android_log_is_debuggable() am: e528be5e7d am: 82ce1f1ff2
am: 346f15d978

Change-Id: Ie8adb033605748d85ffc637729cc04893f404564
2016-10-18 17:00:27 +00:00
Mark Salyzyn
5044bfffe6 adb: use __android_log_is_debuggable() am: 97787a00e6 am: 8648bddf24
am: 8bd258d5a4

Change-Id: I020b8c5be5b73c25384d81373ec28ab245440932
2016-10-18 17:00:19 +00:00
Mark Salyzyn
208a271226 debuggerd: use __android_log_is_debuggable() am: dafe384207 am: 400d85ab2a
am: 9af0fe190c

Change-Id: I5ee3f19516d3b7419b697cdec85c1be779c13a68
2016-10-18 17:00:13 +00:00
Mark Salyzyn
928949ef4e logd: use __android_log_is_debuggable() am: 5740a46e4e am: f606721b59
am: 3b621f4cab

Change-Id: I258a7e428bb17954643acff82ee666fc4596915e
2016-10-18 17:00:08 +00:00
Mark Salyzyn
c89a0a4856 libcutils: use __android_log_is_debuggable() am: b5aa4e7125 am: f43c324ce1
am: 440279599d

Change-Id: I72d416be2d5172807f2de17a5bfb88d89043cb45
2016-10-18 17:00:02 +00:00
Mark Salyzyn
61d28ddedf Merge changes Ibf4774f7,I6568eea0,I35e83679,I9faf8826,I8ee9d999 am: c1f74ca5aa
am: 84dafd104b

Change-Id: Ib79b0677e2408d654c316ec1d613ab4a657a5baa
2016-10-18 16:54:00 +00:00
Mark Salyzyn
346f15d978 fs_mgr: use __android_log_is_debuggable() am: e528be5e7d
am: 82ce1f1ff2

Change-Id: I12f4b462ce4e3b1916d981bad59d68e3eb55b920
2016-10-18 16:53:55 +00:00
Mark Salyzyn
8bd258d5a4 adb: use __android_log_is_debuggable() am: 97787a00e6
am: 8648bddf24

Change-Id: I287aecff26834e4ce083d30584705e0fe1d9ce08
2016-10-18 16:53:49 +00:00
Mark Salyzyn
9af0fe190c debuggerd: use __android_log_is_debuggable() am: dafe384207
am: 400d85ab2a

Change-Id: I33f625c4ea681918e7036fe2701c37c68ea83794
2016-10-18 16:53:43 +00:00
Mark Salyzyn
3b621f4cab logd: use __android_log_is_debuggable() am: 5740a46e4e
am: f606721b59

Change-Id: Ib1c9a9f876aac13dcc6499a43fe09fd20467121c
2016-10-18 16:53:38 +00:00
Mark Salyzyn
440279599d libcutils: use __android_log_is_debuggable() am: b5aa4e7125
am: f43c324ce1

Change-Id: I4562e856e4705ccd71e905432f6c53e2dc13d592
2016-10-18 16:53:31 +00:00
Mark Salyzyn
e455373b57 liblog: Add private interfaces for buffer size properties
Add private function __android_logger_get_buffer_size() to read
properties and compose the default buffer size.  This interface
complements the existing android_looger_get_size() which returns
the logd setting which can differ at runtime.  For use in logd
and dumpstate.  Side effect is we also add the private functions
__android_logger_property_get_bool() and
__android_logger_valid_buffer_size() for reuse in logd.

Test: gTest liblog-unit-test, logd-unit-tests and logcat-unit-tests in
      combination with commit 'logd: Use private interfaces for
      buffer size properties'
Bug: 31750617
Change-Id: Id95cb68f775ef6b427c122e10f6f8291d336d184
2016-10-18 09:48:55 -07:00
Mark Salyzyn
84dafd104b Merge changes Ibf4774f7,I6568eea0,I35e83679,I9faf8826,I8ee9d999
am: c1f74ca5aa

Change-Id: I2cbc465311cc5cab091086b0eb4f1c515af6f6cc
2016-10-18 16:46:20 +00:00
Mark Salyzyn
82ce1f1ff2 fs_mgr: use __android_log_is_debuggable()
am: e528be5e7d

Change-Id: I3dbe3e0f6e3076a24af3fd868907ad7e688517e5
2016-10-18 16:46:19 +00:00
Mark Salyzyn
8648bddf24 adb: use __android_log_is_debuggable()
am: 97787a00e6

Change-Id: I326735c9b0e6163ab5b2215a6bed44ea710409d2
2016-10-18 16:46:15 +00:00
Mark Salyzyn
400d85ab2a debuggerd: use __android_log_is_debuggable()
am: dafe384207

Change-Id: Idba40e16ccc20f66c14aa294033d534212646fbf
2016-10-18 16:46:11 +00:00
Mark Salyzyn
f606721b59 logd: use __android_log_is_debuggable()
am: 5740a46e4e

Change-Id: Idddc3c174b152b90dca915f7bf0cef654b41be3d
2016-10-18 16:46:06 +00:00
Mark Salyzyn
f43c324ce1 libcutils: use __android_log_is_debuggable()
am: b5aa4e7125

Change-Id: Ifd6eafdcaf348fe64e88341cb5c511d28a390e15
2016-10-18 16:46:02 +00:00
Treehugger Robot
c1f74ca5aa Merge changes Ibf4774f7,I6568eea0,I35e83679,I9faf8826,I8ee9d999
* changes:
  fs_mgr: use __android_log_is_debuggable()
  adb: use __android_log_is_debuggable()
  debuggerd: use __android_log_is_debuggable()
  logd: use __android_log_is_debuggable()
  libcutils: use __android_log_is_debuggable()
2016-10-18 16:33:28 +00:00
Mark Salyzyn
39b3339790 Merge "liblog: LIBLOG_ABI_PRIVATE __android_log_is_debuggable()" am: 915d620359 am: 3132543d83
am: 224865fce8

Change-Id: Ibaf5ef907bfc5df08d2bccf51896b3dcc9a1a53f
2016-10-17 22:10:52 +00:00
Mark Salyzyn
224865fce8 Merge "liblog: LIBLOG_ABI_PRIVATE __android_log_is_debuggable()" am: 915d620359
am: 3132543d83

Change-Id: I9b6bd25900ddc878848c5df62ed0697a5363c161
2016-10-17 22:04:23 +00:00
Mark Salyzyn
3132543d83 Merge "liblog: LIBLOG_ABI_PRIVATE __android_log_is_debuggable()"
am: 915d620359

Change-Id: I66547a2d32c96b9baffccb8a391a15a155faf123
2016-10-17 21:57:22 +00:00
Treehugger Robot
915d620359 Merge "liblog: LIBLOG_ABI_PRIVATE __android_log_is_debuggable()" 2016-10-17 21:46:37 +00:00
Mark Salyzyn
af2c0378db Merge "liblog: __android_log_pmsg_file_write() cleanup" am: 6da1ea0e48 am: 07f2357b56
am: 31b618e767

Change-Id: Ifd9d9d93ac9140729fbeadad291e02ee18582bc0
2016-10-17 14:36:22 +00:00
Mark Salyzyn
31b618e767 Merge "liblog: __android_log_pmsg_file_write() cleanup" am: 6da1ea0e48
am: 07f2357b56

Change-Id: Id782bccc1a60b8866384596c7998b12ef8321b23
2016-10-17 14:29:22 +00:00
Mark Salyzyn
07f2357b56 Merge "liblog: __android_log_pmsg_file_write() cleanup"
am: 6da1ea0e48

Change-Id: I795733c69d5dd4be515358900fee0cdb8d5e44b9
2016-10-17 14:22:51 +00:00
Treehugger Robot
6da1ea0e48 Merge "liblog: __android_log_pmsg_file_write() cleanup" 2016-10-17 14:16:46 +00:00
Tianjie Xu
18c25920c2 Add functions in recovery/minzip to libziparchive
Add two functions libziparchive that libminzip has. And create
corresponding unit tests.
1. Open a zip archive from a memory mapped region.
2. A new writer that takes a call back function pointer.
(Used by the OTA updater to stream the data.)

Test: Unit tests passed
Bug: 19472796
Change-Id: I2b2daec71174afe221030357e39bff5faea51e72
2016-10-15 23:16:34 -07:00