Josh Gao
f883e2f65c
Merge "adb: rationalize types." am: 8caf4e7443 am: e335bea277
...
am: 010818f313
Change-Id: I1edebee150c7b36cfa3ca58626eaebf5e9ce647f
2016-10-07 20:48:19 +00:00
Josh Gao
010818f313
Merge "adb: rationalize types." am: 8caf4e7443
...
am: e335bea277
Change-Id: I045ccbebbc1005a501768da3222a211e49821895
2016-10-07 20:44:43 +00:00
Josh Gao
e335bea277
Merge "adb: rationalize types."
...
am: 8caf4e7443
Change-Id: I2e363c31a22b57964688f170c6f96cd8764959e0
2016-10-07 20:41:16 +00:00
Treehugger Robot
8caf4e7443
Merge "adb: rationalize types."
2016-10-07 20:35:00 +00:00
Colin Cross
c0422d1b2a
Merge "libsparse: output_file.c, fix large data chunk issue" am: 62c9101646 am: faaeda8e12
...
am: 4179f2ec65
Change-Id: I8845a058ff2c6f1bc3592655a4805f1e77fd41eb
2016-10-07 17:28:01 +00:00
Colin Cross
4179f2ec65
Merge "libsparse: output_file.c, fix large data chunk issue" am: 62c9101646
...
am: faaeda8e12
Change-Id: I167d7d8083e8e15f89f21b5838fc5b4e97121b10
2016-10-07 17:24:00 +00:00
Colin Cross
faaeda8e12
Merge "libsparse: output_file.c, fix large data chunk issue"
...
am: 62c9101646
Change-Id: Ica50c8fd851ea2e9ff734253b102b3fa8362577f
2016-10-07 17:20:34 +00:00
Colin Cross
62c9101646
Merge "libsparse: output_file.c, fix large data chunk issue"
2016-10-07 17:17:10 +00:00
John Reck
5e106e0da8
Merge "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""" am: b02a355d10 am: 8e7fa9fb7e
...
am: 7e86b688cb
Change-Id: I90d8fc3b22fc59b04532fba6418b73ad8af998e3
2016-10-07 16:46:29 +00:00
John Reck
7e86b688cb
Merge "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""" am: b02a355d10
...
am: 8e7fa9fb7e
Change-Id: Ia5387836b2f07edff773dbe700e93552f3eed85b
2016-10-07 16:41:57 +00:00
John Reck
8e7fa9fb7e
Merge "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib""""
...
am: b02a355d10
Change-Id: I0d520bbf002a317784ff8bb2963676a98df36706
2016-10-07 16:38:02 +00:00
John Reck
b02a355d10
Merge "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib""""
2016-10-07 16:32:38 +00:00
John Reck
6a452917b3
Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""
...
This reverts commit 595c1480d0 .
Revert reason: broke bullhead-eng build in master
Change-Id: Ie64fc31c3c971366ab9f2543b91b8f5d2040868b
2016-10-07 16:22:38 +00:00
Tianjie Xu
5f3f482c3e
Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55 am: 680c3f1dc4 am: f0ce69815f am: 6fb68bb196 am: 2af1a88fcb am: ae8cebf5ae
...
am: c4b38b2b0c
Change-Id: I641e539ec82f995ca9a970f262cb99813e29b7a2
2016-10-07 00:41:09 +00:00
Tianjie Xu
c4b38b2b0c
Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55 am: 680c3f1dc4 am: f0ce69815f am: 6fb68bb196 am: 2af1a88fcb
...
am: ae8cebf5ae
Change-Id: I251374041170b92d52dd1aec5797763881f3118c
2016-10-07 00:37:32 +00:00
Tianjie Xu
faa2093cc2
Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55 am: 680c3f1dc4 am: f0ce69815f am: 6fb68bb196
...
am: 206150bf78
Change-Id: Iccc08b758095957222c2f76782bf317d059259eb
2016-10-07 00:33:31 +00:00
Tianjie Xu
ae8cebf5ae
Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55 am: 680c3f1dc4 am: f0ce69815f am: 6fb68bb196
...
am: 2af1a88fcb
Change-Id: I7a5fdc8df2449a332c7696c472e25880bfccc67f
2016-10-07 00:33:31 +00:00
Tianjie Xu
206150bf78
Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55 am: 680c3f1dc4 am: f0ce69815f
...
am: 6fb68bb196
Change-Id: Id8f75debfae94d35dbbee9799632cba3f72648d0
2016-10-07 00:30:02 +00:00
Tianjie Xu
2af1a88fcb
Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55 am: 680c3f1dc4 am: f0ce69815f
...
am: 6fb68bb196
Change-Id: I02579d25e7117053d6d20781ae75c64fdb76b88d
2016-10-07 00:30:01 +00:00
Tianjie Xu
6fb68bb196
Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55 am: 680c3f1dc4
...
am: f0ce69815f
Change-Id: I8e69df083b6d5cd3a7e6bf7113ae836932c2e9f2
2016-10-07 00:26:31 +00:00
Tianjie Xu
f0ce69815f
Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55
...
am: 680c3f1dc4
Change-Id: Ibd3e65922bb05b1247018d6dc89d3f79cf0eedd2
2016-10-07 00:23:01 +00:00
Tianjie Xu
680c3f1dc4
Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76
...
am: 398adf9b55
Change-Id: If29777acccff5966a66e427e5baaeb536e161aaa
2016-10-07 00:19:30 +00:00
Tianjie Xu
398adf9b55
Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224
...
am: 167562aa76
Change-Id: Icb066cdaf63d87324c6eca8b5b45dbc23235aaa2
2016-10-07 00:15:00 +00:00
Tianjie Xu
167562aa76
Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654
...
am: 8788591224
Change-Id: I2f0ca98c74f23b1125f29b1eaf810143a83754b4
2016-10-07 00:11:29 +00:00
Tianjie Xu
8788591224
Fix out of bound access in libziparchive am: 1ee4892e66
...
am: c24dd97654
Change-Id: Ifddcfb7e658156c22539e07915115f4b657925b1
2016-10-07 00:07:59 +00:00
Tianjie Xu
c24dd97654
Fix out of bound access in libziparchive
...
am: 1ee4892e66
Change-Id: I26b48df5a9d39933b90ac063172b4b4ae8428bfd
2016-10-07 00:04:29 +00:00
Josh Gao
06d61d4d96
adb: rationalize types.
...
Use fixed length types for structs going over the wire, constify
arguments where possible, use char* instead of unsigned char* for
apacket data, and assorted other refactoring.
Bug: http://b/29273531
Test: python test_device.py with every combination of old/new adb and adbd
Change-Id: I0b6f818a32be5386985aa4519f542003cf427f9d
2016-10-06 14:50:02 -07:00
Josh Gao
e1afd17d75
Merge "adb: split up adb_auth.cpp." am: 4a8b178c97 am: 4546c8ac3d
...
am: 58a5e5a50b
Change-Id: Ibb499732491fc584be2b1e61f95bb9375fad16ec
2016-10-06 19:54:06 +00:00
Josh Gao
58a5e5a50b
Merge "adb: split up adb_auth.cpp." am: 4a8b178c97
...
am: 4546c8ac3d
Change-Id: Idb9ed3e21524893943ecd176d9abe6a1e3b5493b
2016-10-06 19:50:37 +00:00
Josh Gao
4546c8ac3d
Merge "adb: split up adb_auth.cpp."
...
am: 4a8b178c97
Change-Id: I846a06ca04aad456c6659dd6db4c8d0666fc6707
2016-10-06 19:47:11 +00:00
Treehugger Robot
4a8b178c97
Merge "adb: split up adb_auth.cpp."
2016-10-06 19:37:31 +00:00
Josh Gao
3bd2879d8e
adb: split up adb_auth.cpp.
...
All of the functions in adb_auth.cpp were used in only one of
adb/adbd. Split up them up into adb_auth_host.cpp and adbd_auth.cpp
respectively.
Bug: http://b/29273531
Test: built and flashed bullhead, adb still works
Change-Id: Ib610c5157522634cc273511175152f1306cc52a7
2016-10-06 12:36:26 -07:00
Jeremy Compostella
fca594c2de
libsparse: output_file.c, fix large data chunk issue
...
CHUNK_HEADER structure type allows DATA chunk to be up to MAX_UINT
large.
The write() callback LEN parameter should be unsigned int.
Also:
- write() callback should continue to write data if less than expected
data have been written.
- gzerror() returns LEN on success, 0 otherwise
Test: manual
Change-Id: Id46d664b84c1a506f419524fe28055f784c2ae7a
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
2016-10-06 09:53:42 -07:00
Dimitry Ivanov
674e2a3c00
Merge "Revert "Revert "Remove liblog from libcutils as a whole static lib""" am: 8949696d33 am: e89ec3c4e0
...
am: 54be582396
Change-Id: I73c8bdff9d4d804b6c259d1beab0fe9a442a741a
2016-10-06 14:26:59 +00:00
Mark Salyzyn
c377c40531
Merge "logd: report logging memory overhead" am: d3754ff696 am: 386630f4ce
...
am: 1f6e063e06
Change-Id: Ia7daa52e3d3cf68dd5dcd70ba83f8aa38ae6f8da
2016-10-06 14:26:46 +00:00
Dimitry Ivanov
54be582396
Merge "Revert "Revert "Remove liblog from libcutils as a whole static lib""" am: 8949696d33
...
am: e89ec3c4e0
Change-Id: I06d155471668c4ad79089e52037f8502f56406ff
2016-10-06 14:24:02 +00:00
Mark Salyzyn
1f6e063e06
Merge "logd: report logging memory overhead" am: d3754ff696
...
am: 386630f4ce
Change-Id: Ia8841921f55a4618e2b1301b911daf780f0f7d56
2016-10-06 14:23:48 +00:00
Dimitry Ivanov
e89ec3c4e0
Merge "Revert "Revert "Remove liblog from libcutils as a whole static lib"""
...
am: 8949696d33
Change-Id: I8099e374eccda844384682256af8d802e3fa0aea
2016-10-06 14:23:25 +00:00
Treehugger Robot
8949696d33
Merge "Revert "Revert "Remove liblog from libcutils as a whole static lib"""
2016-10-06 14:20:41 +00:00
Mark Salyzyn
386630f4ce
Merge "logd: report logging memory overhead"
...
am: d3754ff696
Change-Id: I3e0f11864dab17cc70f0e68a9b69adf8f1edb9d2
2016-10-06 14:19:46 +00:00
Treehugger Robot
d3754ff696
Merge "logd: report logging memory overhead"
2016-10-06 14:15:48 +00:00
Dimitry Ivanov
595c1480d0
Revert "Revert "Remove liblog from libcutils as a whole static lib""
...
This reverts commit f93d732a45 .
Bug: http://b/31289077
Bug: http://b/27171986
Change-Id: Ib6e6c0a01296f0a01d98cbf1a9d2659883280d44
2016-10-06 12:47:07 +00:00
Tao Bao
4fa6e4855b
Merge "adb: Remove the obsolete include path to ext4_utils." am: 9f828a5383 am: a00020317e
...
am: 9766909149
Change-Id: I1059d176220327d6f1ecb5c56dde2bebf31c371f
2016-10-06 06:29:57 +00:00
Tao Bao
9766909149
Merge "adb: Remove the obsolete include path to ext4_utils." am: 9f828a5383
...
am: a00020317e
Change-Id: I474494405de42c794af3160898a867e766c558b1
2016-10-06 06:26:25 +00:00
Tao Bao
a00020317e
Merge "adb: Remove the obsolete include path to ext4_utils."
...
am: 9f828a5383
Change-Id: Ia833226376111a0ead4f0c5b5d79768a8b8dbeb2
2016-10-06 06:23:27 +00:00
Treehugger Robot
9f828a5383
Merge "adb: Remove the obsolete include path to ext4_utils."
2016-10-06 06:18:45 +00:00
Tao Bao
fee161d189
adb: Remove the obsolete include path to ext4_utils.
...
Since commit 8ad80763e4 has removed
'#include "ext4_sb.h"', there's no more reference to ext4_utils headers.
Test: `mmma system/core/adb`
Change-Id: I7ca1a6e91f1e0de84238c2a7facbebe9600a3d87
2016-10-05 18:06:03 -07:00
Mark Salyzyn
9af33ee78c
logd: report logging memory overhead
...
On 64 bit system, calculates to roughly 80 bytes of metadata and
list overhead for each entry.
In unit test example, we report 3388987 bytes of logging data and
overhead total, showmap reports 4652K of dirty data. We still want
to account for the remainder (fragmentation, other sources of
internal allocations etc).
Test: see values and check math
Bug: 31942525
Change-Id: I75f3162ce691faf1ae5a5dec18939fea535ede7e
2016-10-05 15:32:40 -07:00
Andreas Gampe
9f5a6a6078
Merge "Base: Hand complete log message to aborter" am: 0d762648d0 am: e082ce827d
...
am: 6049a29703
Change-Id: I92b013c4025b4a800cf332bbd3d2802d74e7c45a
2016-10-05 20:06:19 +00:00
Andreas Gampe
6049a29703
Merge "Base: Hand complete log message to aborter" am: 0d762648d0
...
am: e082ce827d
Change-Id: I0705e17a8250791fa5a8af2af9ca2c93316aee6d
2016-10-05 20:03:46 +00:00