Mark Salyzyn
b4c9ab960e
Merge "system/core: preparation to pull back interfaces from android/log.h" am: 27d2d49f48
am: 8a7297a09f
...
am: c561af07ae
Change-Id: I7bfb6dd925739345624a1ed16c0c3cb2106ad098
2016-10-20 18:21:18 +00:00
Mark Salyzyn
c561af07ae
Merge "system/core: preparation to pull back interfaces from android/log.h" am: 27d2d49f48
...
am: 8a7297a09f
Change-Id: Ia1289b9912a1171700f6c86782324f668cfbe8cc
2016-10-20 18:11:57 +00:00
Mark Salyzyn
8a7297a09f
Merge "system/core: preparation to pull back interfaces from android/log.h"
...
am: 27d2d49f48
Change-Id: I604bb1d4cf62636663fa92e3d14a55887dbcae23
2016-10-20 18:03:57 +00:00
Mark Salyzyn
27d2d49f48
Merge "system/core: preparation to pull back interfaces from android/log.h"
2016-10-20 17:53:45 +00:00
Yabin Cui
898f949b59
Merge "libbase: add parsedouble.h." am: d55705796e
am: de3e60043c
...
am: 750ecd9a7c
Change-Id: Iaf6fd246cb7444ed80a0e9812fa49a20cebb2b94
2016-10-20 17:38:59 +00:00
Yabin Cui
750ecd9a7c
Merge "libbase: add parsedouble.h." am: d55705796e
...
am: de3e60043c
Change-Id: Ib3bfb0b025f49d50c26701417ac6c5a138f744c3
2016-10-20 17:31:30 +00:00
Yabin Cui
de3e60043c
Merge "libbase: add parsedouble.h."
...
am: d55705796e
Change-Id: I2d4a72262c8460c5c2c924b92e3cacb1cc8225d6
2016-10-20 17:22:57 +00:00
Yabin Cui
d55705796e
Merge "libbase: add parsedouble.h."
2016-10-20 17:18:36 +00:00
Mark Salyzyn
cfd5b080af
system/core: preparation to pull back interfaces from android/log.h
...
Point to log/log.h where necessary, define LOG_TAG where necessary.
Accept that private/android_logger.h is suitable replacement for
log/logger.h and android/log.h.
Correct liblog/README
Effectively a cleanup and controlled select revert of
'system/core: drop or replace log/logger.h' and
'system/core: Replace log/log.h with android/log.h'.
Test: compile
Bug: 30465923
Change-Id: Ic2ad157bad6f5efe2c6af293a73bb753300b17a2
2016-10-20 08:11:39 -07:00
Ting-Yuan Huang
7fa311c317
Merge "adb: fix undefined behavior" am: 1edd61ce5d
am: e02e11835d
...
am: aba7d8a1b8
Change-Id: If64dc5eb602204fbcbbb585209008b808a2584cb
2016-10-20 04:56:01 +00:00
Ting-Yuan Huang
aba7d8a1b8
Merge "adb: fix undefined behavior" am: 1edd61ce5d
...
am: e02e11835d
Change-Id: Ied19f5ab73244e621e97c82f324f1f5f0f36ec07
2016-10-20 04:46:44 +00:00
Ting-Yuan Huang
e02e11835d
Merge "adb: fix undefined behavior"
...
am: 1edd61ce5d
Change-Id: I35cbda2fa031dc8627aaaffb5e50be98ddb20430
2016-10-20 04:38:12 +00:00
Treehugger Robot
1edd61ce5d
Merge "adb: fix undefined behavior"
2016-10-20 04:32:52 +00:00
Ting-Yuan Huang
ef57d54f80
adb: fix undefined behavior
...
system/core/adb/shell_service_protocol_test.cpp:94:14: warning: Null
passed to a callee that requires a non-null 1st parameter
!memcmp(data, protocol->data(), data_length));
C99 requires memcmp() to take non-null pointers.
Bug: none
Test: clang-tidy doesn't complain
Change-Id: I77b8d9373fa257a070ffc7fd318231c2c9ea84c3
2016-10-19 19:39:44 -07:00
Yabin Cui
997cba4271
libbase: add parsedouble.h.
...
Bug: http://b/24905115
Test: run libbase_test --gtest_filter=parsedouble.smoke.
Change-Id: I604424772f2082b420935e6647da03981c0b8929
2016-10-19 11:19:42 -07:00
Mark Salyzyn
bc67a8a8f3
Merge "logd: Use private interfaces for buffer size properties" am: 6da6d37c81
am: 1bd1e570c6
...
am: 08603100e5
Change-Id: If451fd61397ba71b10468befe7acd5e582e8771f
2016-10-19 14:50:52 +00:00
Mark Salyzyn
08603100e5
Merge "logd: Use private interfaces for buffer size properties" am: 6da6d37c81
...
am: 1bd1e570c6
Change-Id: I3749ced77d69dbcb4d62719d8d19aefc7a437052
2016-10-19 14:42:51 +00:00
Mark Salyzyn
1bd1e570c6
Merge "logd: Use private interfaces for buffer size properties"
...
am: 6da6d37c81
Change-Id: I05ec69d785c9df9c9a397947ad9f6bd4c915c078
2016-10-19 14:34:51 +00:00
Mark Salyzyn
6da6d37c81
Merge "logd: Use private interfaces for buffer size properties"
2016-10-19 14:31:04 +00:00
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