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,012 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

25012 Commits

Author SHA1 Message Date
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
Elliott Hughes 8615d79d85 Merge "Most accept/accept4 calls in system/core don't actually want the remote address." 
am: 299d64144b

Change-Id: I3fb9678dfed08f0b1d6e90e547ecae6cdcabc9a1
 2016-08-23 23:03:20 +00:00
Treehugger Robot 299d64144b Merge "Most accept/accept4 calls in system/core don't actually want the remote address." 2016-08-23 22:48:24 +00:00
Mark Salyzyn ee431112ff libcutils: Add ashmem_valid() function 
Bug: 30310689
Change-Id: I14c52c5d52745a725799652b87c86281ac214899
 2016-08-23 15:29:28 -07:00
Mark Salyzyn df7a4c6bae liblog: add __android_log_close() 
Bug: 30963384
Change-Id: I901e6ac2cc3c601bbecc2d64e00a98e2ab448210
 2016-08-23 15:25:03 -07:00
Mark Salyzyn 305374cf0f logger: validate hdr_size field in logger entry 
- check hdr_size to make sure it is in the expected range
  from sizeof entry_v1 to entry (entry_v4).
- alter msg() method to report NULL on invalid hdr_size
- alter all users of msg() method.

Bug: 30947841
Change-Id: I9bc1740d7aa9f37df5be966c18de1fb9de63d5dd
 2016-08-23 14:51:50 -07:00
Josh Gao cc20f90d28 Merge "debuggerd: don't display fault addr for manually sent signals." am: ad52cbb9ec am: 504d4ccd7c 
am: c8146aa39f

Change-Id: I792cceaf92e2d9865217a00f433fabf295c40035
 2016-08-23 21:27:23 +00:00
Josh Gao c8146aa39f Merge "debuggerd: don't display fault addr for manually sent signals." am: ad52cbb9ec 
am: 504d4ccd7c

Change-Id: Iac8f64e01b5dd3fa9ab6e34c2c151800142ccc69
 2016-08-23 21:24:53 +00:00
Josh Gao 504d4ccd7c Merge "debuggerd: don't display fault addr for manually sent signals." 
am: ad52cbb9ec

Change-Id: I34284b398c32dbdfe2074d44d316f81fc45deee8
 2016-08-23 21:23:15 +00:00
Treehugger Robot ad52cbb9ec Merge "debuggerd: don't display fault addr for manually sent signals." 2016-08-23 21:03:18 +00:00
Elliott Hughes fc04dce0f1 Merge "debuggerd: set SOCK_NONBLOCK in accept rather than later." am: 82b67fff06 am: 0d2ef3dc86 
am: 50a99aa6cb

Change-Id: Id66bc64ba1aee8c12f8609bc6013a59f6e95ccad
 2016-08-23 20:14:01 +00:00
Elliott Hughes 50a99aa6cb Merge "debuggerd: set SOCK_NONBLOCK in accept rather than later." am: 82b67fff06 
am: 0d2ef3dc86

Change-Id: Ie8ae5707455f4d1741ca87ef515ea9a142e05aa5
 2016-08-23 20:10:01 +00:00
Elliott Hughes 0d2ef3dc86 Merge "debuggerd: set SOCK_NONBLOCK in accept rather than later." 
am: 82b67fff06

Change-Id: I6f2e72a4847fbfac8e1ba78321be7e026f7629bd
 2016-08-23 20:05:48 +00:00
Elliott Hughes 3dcfa3fb1c Most accept/accept4 calls in system/core don't actually want the remote address. 
So don't write the extra code for it or waste the kernel's time
copying it around.

Change-Id: I93de64064c2d4fe58ba5b5322cfa69bf31a76dad
 2016-08-23 12:50:00 -07:00
Elliott Hughes 82b67fff06 Merge "debuggerd: set SOCK_NONBLOCK in accept rather than later." 2016-08-23 19:35:54 +00:00
Josh Gao 344ca5a681 debuggerd: don't display fault addr for manually sent signals. 
Bug: http://b/30819045
Change-Id: Ic8ab21298dcba6acdfa876e7c729b14b0bf2afbb
Test: `killall -TRAP surfaceflinger` no longer shows fault addr,
      crasher still does
 2016-08-23 12:31:14 -07:00
Daniel Rosenberg 9f0c6916c7 resolve merge conflicts of 852a4c7 to nyc-mr1-dev-plus-aosp 
Change-Id: Ifc076749b4e23af00e0c900a28dfe770adb3e6b6
 2016-08-22 22:42:42 -07:00
Daniel Rosenberg 10c50f4c50 Merge "DO NOT MERGE: Fix bug in product path building" into nyc-mr1-dev am: b7dece1b0e 
am: d8c1fbc1ef

Change-Id: I04a41127683f45362adc999719a594b2977a8d7e
 2016-08-23 05:25:32 +00:00
Daniel Rosenberg ff1a7ac68b DO NOT MERGE: Fix bug in product path building am: 9914284d6a 
am: a792c4cd7c  -s ours

Change-Id: I109f392ebca3d4b09993b8a60c9edade3ae554f1
 2016-08-23 05:20:03 +00:00
Daniel Rosenberg 852a4c761d resolve merge conflicts of 40eff95 to stage-aosp-master 
am: 559cc01e3e

Change-Id: Ief493c828bc7e03967a2bb5d439a7a4fd638a253
 2016-08-23 04:32:30 +00:00