openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
25,031 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

25031 Commits

Author SHA1 Message Date
Josh Gao b1cadcfc5b Merge "adb: factor out socket specification." am: bd7d2e2ec0 am: f95e728431 
am: 4c58c8a892

Change-Id: Idcb03acf63ba3e64f81f55c6b7708eb2cf945d8d
 2016-08-27 03:05:48 +00:00
Josh Gao 4c58c8a892 Merge "adb: factor out socket specification." am: bd7d2e2ec0 
am: f95e728431

Change-Id: Ibbed2dea019538491650eab41bd75e4f7546a909
 2016-08-27 03:02:17 +00:00
Josh Gao f95e728431 Merge "adb: factor out socket specification." 
am: bd7d2e2ec0

Change-Id: I14f452e11395139f5687e5096af5b278eb14d63d
 2016-08-27 02:58:50 +00:00
Treehugger Robot bd7d2e2ec0 Merge "adb: factor out socket specification." 2016-08-27 02:50:34 +00:00
Colin Cross 7ac7599c0e Merge "Replace libziparchive-host with libziparchive" am: 091b631915 am: 904c1042cd 
am: 4379ca6d18

Change-Id: I7cf621ad49afd892677cabd5c687e6b49d2896fc
 2016-08-26 20:40:35 +00:00
Colin Cross 4379ca6d18 Merge "Replace libziparchive-host with libziparchive" am: 091b631915 
am: 904c1042cd

Change-Id: I3e3a49fb45d5387af675e8d7b20974796d3ee962
 2016-08-26 20:32:28 +00:00
Colin Cross 904c1042cd Merge "Replace libziparchive-host with libziparchive" 
am: 091b631915

Change-Id: I4ee6244e8fc2fad0edd17be39cd275abbcf8e62d
 2016-08-26 20:25:33 +00:00
Colin Cross 091b631915 Merge "Replace libziparchive-host with libziparchive" 2016-08-26 20:18:55 +00:00
Colin Cross 99f6b86733 Replace libziparchive-host with libziparchive 
libziparchive-host is no longer necessary, and mixing libziparchive-host
and libziparchive can cause ODR violations.

Change-Id: I27b2cc9974000ee7bf1d1ac15fd7b069862d9b01
 2016-08-26 11:12:38 -07:00
Christopher Ferris e3cc4e5bb4 Fix race condition updating local map data. am: 0c572d01af 
am: b0e63a69d2

Change-Id: I75b9e9d20675e95f943810765ee103b40e923316
 2016-08-26 18:07:20 +00:00
Christopher Ferris b0e63a69d2 Fix race condition updating local map data. 
am: 0c572d01af

Change-Id: I0b5c8a6c1a3816b013f8962ec5bcc5433f28f9e2
 2016-08-26 18:00:49 +00:00
Josh Gao cfb21412e5 adb: factor out socket specification. 
Move the logic for string socket specification out to separate
functions to facilitate using arbitrary sockets for the adb command
socket.

Bug: http://b/30445394
Change-Id: Icd8fdb853272edc029fb3a0f5b18e941dc8ef52c
Test: adb_test, adbd_test, test_device.py
 2016-08-25 17:12:26 -07:00
Christopher Ferris 0c572d01af Fix race condition updating local map data. 
If the underlying local map changes, it's possible for multiple
threads to try and modify the map data associated with the UnwindLocalMap
object. Add a lock when generating the local map to avoid this problem.

In addition, add a read lock whenever any caller gets the maps iterator.
Updated all iterator callers to make this lock.

Bug: 29387050
Bug: 31067025

(cherry picked from commit 3a14004c7f)

Change-Id: Id00116f156a24b36085c0d5dfc3dde4d2ac55194
 2016-08-25 15:01:53 -07:00
Martijn Coenen 111ef54a28 Merge changes from topic 'utf' am: 3a07e5bf94 am: aa7fd8a3ec 
am: ade3876260

Change-Id: Ifec806c7553b36a6502a8b5bb3dec559c117f4cc
 2016-08-25 20:31:42 +00:00
Martijn Coenen ade3876260 Merge changes from topic 'utf' am: 3a07e5bf94 
am: aa7fd8a3ec

Change-Id: I3c90317d492a84ff99b18463d6f489e7b1cca61b
 2016-08-25 20:24:14 +00:00
Martijn Coenen aa7fd8a3ec Merge changes from topic 'utf' 
am: 3a07e5bf94

Change-Id: I4a1b0a32f4b2895ce170ce3a7cf6a30dfeca118f
 2016-08-25 20:18:18 +00:00
Martijn Coenen 3a07e5bf94 Merge changes from topic 'utf' 
* changes:
  libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
  Unicode: specify destination length in utf8_to_utf16 methods
 2016-08-25 20:08:14 +00:00
Sergio Giro 1cfa56d46c libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 
Inconsistent behaviour between utf16_to_utf8 and utf16_to_utf8_length
is causing a heap overflow.

Correcting the length computation and adding bound checks to the
conversion functions.

Test: ran libutils_tests
Bug: 29250543
Change-Id: I6115e3357141ed245c63c6eb25fc0fd0a9a7a2bb
(cherry picked from commit c4966a363e)
 2016-08-25 20:07:51 +00:00
Sergio Giro 9de6776321 Unicode: specify destination length in utf8_to_utf16 methods 
String16(const char *utf8) now returns the empty string in case
a string ends halfway throw a utf8 character.

Bug: 29267949
Clean cherry-pick from 1dcc0c8239

Change-Id: I5223caa7d42f4582a982609a898a02043265c6d3
 2016-08-25 19:57:06 +00:00
Josh Gao 7424dfa361 Merge changes I0ee130db,I33d356fd am: e461b37965 am: 59561a64b7 
am: 87ff463d6e

Change-Id: I72ac706e6866b6f391cc950a677a598df79fa9a0
 2016-08-25 02:09:55 +00:00
Josh Gao 87ff463d6e Merge changes I0ee130db,I33d356fd am: e461b37965 
am: 59561a64b7

Change-Id: If05615e9e5e69bb496fa9eb3c49ba7f9f5a41c45
 2016-08-25 02:06:55 +00:00
Josh Gao 59561a64b7 Merge changes I0ee130db,I33d356fd 
am: e461b37965

Change-Id: I4a2fe8cec7db8db9b6f701dace34d76879b13e7e
 2016-08-25 02:03:56 +00:00
Josh Gao e461b37965 Merge changes I0ee130db,I33d356fd 
* changes:
  adb: remove unnecessary addr arguments to accept.
  adb: check our socketpair ends in our win32 emulation.
 2016-08-25 01:59:23 +00:00
Hans Boehm 2d3545fe82 Merge "Make RefBase more robust and debuggable" am: daac359be7 am: 7bf3d21fde 
am: 7dddf9433c

Change-Id: Ia8bdef250b29d964a9ab07c450da31a368bb3143
 2016-08-24 23:52:14 +00:00
Hans Boehm 7dddf9433c Merge "Make RefBase more robust and debuggable" am: daac359be7 
am: 7bf3d21fde

Change-Id: I643c4bd38062b80d382c50ed161f5440f35c1dd9
 2016-08-24 23:49:14 +00:00
Hans Boehm 7bf3d21fde Merge "Make RefBase more robust and debuggable" 
am: daac359be7

Change-Id: I9844b2260b607987c688869c643560d5b9c92d75
 2016-08-24 23:46:16 +00:00
Hans Boehm daac359be7 Merge "Make RefBase more robust and debuggable" 2016-08-24 23:36:13 +00:00
Andy Hung 8ec6753d61 Fix Mutex::timedLock to properly handle relative time am: 604ba48220 am: 708b9d118a 
am: 47e5ca61e2

Change-Id: I5c351fbdc485acbcb33426b99ea6b900519ee0e3
 2016-08-24 22:50:00 +00:00
Andy Hung 47e5ca61e2 Fix Mutex::timedLock to properly handle relative time am: 604ba48220 
am: 708b9d118a

Change-Id: Iab26e0bfdb90dd2a81492cf8b7497c4f2ff2f9ce
 2016-08-24 22:47:16 +00:00
Andy Hung 708b9d118a Fix Mutex::timedLock to properly handle relative time 
am: 604ba48220

Change-Id: I9adb6d4103a697937ed2d93330f2f36ecd868c76
 2016-08-24 22:43:59 +00:00
Andy Hung 604ba48220 Fix Mutex::timedLock to properly handle relative time 
Bug: 31008450
Change-Id: Ie6c17e17b7a8c3d8a087c47be535e9d04f285380
 2016-08-24 22:29:11 +00:00
Damien Bargiacchi 789d4c65b4 Merge "Update to new minui text API" into cw-f-dev 
am: d69818c53c

Change-Id: Iaba2b147e6a41745b771d57fda1b507bbd0a93bb
 2016-08-24 20:45:21 +00:00
Damien Bargiacchi ada99f91b0 Update to new minui text API 
am: 0ee524de68

Change-Id: I19341d2639b6efeb13eddaae1083252eeafc77fc
 2016-08-24 20:45:17 +00:00
Damien Bargiacchi d69818c53c Merge "Update to new minui text API" into cw-f-dev 2016-08-24 20:36:36 +00:00
Josh Gao 78e1eb1949 adb: remove unnecessary addr arguments to accept. 
Follow up to https://android-review.googlesource.com/#/c/261412/

Change-Id: I0ee130db302940f3224cc823a26b02fc45da0fca
Test: mma
 2016-08-24 13:06:06 -07:00
Josh Gao 5990191c4e adb: check our socketpair ends in our win32 emulation. 
In our Win32 socketpair emulation, check that the ends are properly
connected before returning.

Change-Id: I33d356fd9ebcac89fc6a89a5200e926032220383
Test: no additional failing tests in adb_test.exe
 2016-08-24 13:06:06 -07:00
Mark Salyzyn e5bda4d0ec Merge "liblog: add __android_log_close()" am: 812d1c7ea2 am: 6322efe522 
am: ed421af68d

Change-Id: Ifacd3de810c30a9b79cb262ab4c2432d8b1c0791
 2016-08-24 16:10:09 +00:00
Mark Salyzyn af3623281f Merge "logger: validate hdr_size field in logger entry" am: fcf7ab8b1b am: 2d562c9dce 
am: 098b5887c6

Change-Id: I4d067039a766e7079a91eb56d2ffb8d68aba58b5
 2016-08-24 16:10:08 +00:00
Mark Salyzyn ed421af68d Merge "liblog: add __android_log_close()" am: 812d1c7ea2 
am: 6322efe522

Change-Id: Ib61d4ec5102fcfb12c48250c019fcdf019c2ffc5
 2016-08-24 16:07:39 +00:00
Mark Salyzyn 098b5887c6 Merge "logger: validate hdr_size field in logger entry" am: fcf7ab8b1b 
am: 2d562c9dce

Change-Id: I5721e8614079a04c2dc364304d0ffed10d74be90
 2016-08-24 16:07:38 +00:00
Mark Salyzyn 6322efe522 Merge "liblog: add __android_log_close()" 
am: 812d1c7ea2

Change-Id: I2ba5ed22e78564a864bab6b550b6d2bd2609a629
 2016-08-24 16:05:05 +00:00
Mark Salyzyn 2d562c9dce Merge "logger: validate hdr_size field in logger entry" 
am: fcf7ab8b1b

Change-Id: Ic88fe616256ab4949040771d3bed1dfb823ab981
 2016-08-24 16:05:04 +00:00
Treehugger Robot 812d1c7ea2 Merge "liblog: add __android_log_close()" 2016-08-24 15:58:48 +00:00
Treehugger Robot fcf7ab8b1b Merge "logger: validate hdr_size field in logger entry" 2016-08-24 15:56:23 +00:00
Mark Salyzyn 8e5cb037c4 Merge "libcutils: Add ashmem_valid() function" am: d00c7470ea am: 8b1f7b595c 
am: da07f7880c

Change-Id: I3a4cf9a2cd848aae04ec3e88ae1e50a51774cd5f
 2016-08-24 15:54:08 +00:00
Mark Salyzyn da07f7880c Merge "libcutils: Add ashmem_valid() function" am: d00c7470ea 
am: 8b1f7b595c

Change-Id: I1be0fc5d74c609ec42578c29c7af9d897708f8c6
 2016-08-24 15:51:08 +00:00
Mark Salyzyn 8b1f7b595c Merge "libcutils: Add ashmem_valid() function" 
am: d00c7470ea

Change-Id: Ib09d3ee7bb131c30f59ea273f357c045394206fb
 2016-08-24 15:48:55 +00:00
Treehugger Robot d00c7470ea Merge "libcutils: Add ashmem_valid() function" 2016-08-24 15:39:06 +00:00
Elliott Hughes 0426ecaf82 Merge "Most accept/accept4 calls in system/core don't actually want the remote address." am: 299d64144b am: 8615d79d85 
am: 66e5e2432a

Change-Id: I5d7b98fa3e9c2d8c16a1aa73e3d5a197dc150c2b
 2016-08-23 23:14:44 +00:00
Elliott Hughes 66e5e2432a Merge "Most accept/accept4 calls in system/core don't actually want the remote address." am: 299d64144b 
am: 8615d79d85

Change-Id: I89aeabf6efa8217c9acd3f8a766bbd18f7e994fa
 2016-08-23 23:05:59 +00:00