Commit Graph

24758 Commits

Author SHA1 Message Date
Yifan Hong 92b1727472 Merge "Add 0X as a valid hex prefix for parseint" am: 392a2c8f0f
am: 11373394fd

Change-Id: I3140b23ec23d4c8af3a25afa3e20a86bf0dd8beb
2016-10-08 10:47:07 +00:00
Yifan Hong 11373394fd Merge "Add 0X as a valid hex prefix for parseint"
am: 392a2c8f0f

Change-Id: Ia9409c0424fab1966197ea5bb7a4532ed9a8c709
2016-10-08 10:42:37 +00:00
Treehugger Robot 392a2c8f0f Merge "Add 0X as a valid hex prefix for parseint" 2016-10-08 10:36:02 +00:00
Dimitry Ivanov d1f924f663 Merge "Revert "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib""""" am: afda14e61d
am: a46dfe2306

Change-Id: I73ff45d49c6bd174923c747d16063f18bc1ea299
2016-10-08 08:00:52 +00:00
Dimitry Ivanov a46dfe2306 Merge "Revert "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""""
am: afda14e61d

Change-Id: I5f9d475db5e5f843f59c1a9484f4ed6174e62650
2016-10-08 07:56:21 +00:00
Dimitry Ivanov afda14e61d Merge "Revert "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib""""" 2016-10-08 07:51:33 +00:00
Chia-I Wu cb52dc258e Merge "Add native_handle_clone" am: e8f6c7398b
am: 462e087e40

Change-Id: I745341bf4c76fc8c75f36e578cf1086808119426
2016-10-08 01:34:05 +00:00
Chia-I Wu 462e087e40 Merge "Add native_handle_clone"
am: e8f6c7398b

Change-Id: I788664dbcd2663f197292368bb89cd1b98e9489f
2016-10-08 01:30:01 +00:00
Chia-I Wu e8f6c7398b Merge "Add native_handle_clone" 2016-10-08 01:25:35 +00:00
Yifan Hong 89fbd6349f Add 0X as a valid hex prefix for parseint
Bug: 31983995

Test: make android.hardware.tests.expression@1.0
Change-Id: I526d73f96c519f84dec93befa442b1d2fff7979b
2016-10-07 16:50:16 -07: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
Dimitry Ivanov 625484ddfa Revert "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib""""
This reverts commit 6a452917b3.

Bug: http://b/31289077
Bug: http://b/27171986
Change-Id: Id020fa10c50847bf16a2fcbc7d5e72cf8766b711
2016-10-07 18:43:37 +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 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 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 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 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 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 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 6049a29703 Merge "Base: Hand complete log message to aborter" am: 0d762648d0
am: e082ce827d

Change-Id: I0705e17a8250791fa5a8af2af9ca2c93316aee6d
2016-10-05 20:03:46 +00:00
Andreas Gampe e082ce827d Merge "Base: Hand complete log message to aborter"
am: 0d762648d0

Change-Id: I33dd453e91aa60f3d797d4bd2db53d9ac1599a0b
2016-10-05 20:00:46 +00:00
Treehugger Robot 0d762648d0 Merge "Base: Hand complete log message to aborter" 2016-10-05 19:53:25 +00:00