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

5718 Commits

Author SHA1 Message Date
Nick Kralevich f5d79aa4bb Merge "Don't use __attribute__(__error__)" 2013-06-18 20:23:29 +00:00
Nick Kralevich bda25e4ed5 Don't use __attribute__(__error__) 
__attribute(__error__) isn't supported on clang, and generates
compiler warnings. Use __errordecl instead, which does the right thing
for different compilers.

Change-Id: Ifb0797a5de703cc5b3c39dcd97bcfaf404f1cafa
 2013-06-18 12:14:47 -07:00
Elliott Hughes 228ee639be am 98c02528: am 19188955: am d92e35eb: Merge "Add Qisda usb config" 
* commit '98c02528a2f8bdc0f31a78a8b0b086f4ae823310':
  Add Qisda usb config
 2013-06-18 11:37:47 -07:00
Elliott Hughes 98c02528a2 am 19188955: am d92e35eb: Merge "Add Qisda usb config" 
* commit '19188955b50ef6cb133780f66384e9fa055acfac':
  Add Qisda usb config
 2013-06-18 11:35:46 -07:00
Elliott Hughes 19188955b5 am d92e35eb: Merge "Add Qisda usb config" 
* commit 'd92e35eb7b97f349054390cfee1d40154dba6d66':
  Add Qisda usb config
 2013-06-18 11:32:58 -07:00
Elliott Hughes d92e35eb7b Merge "Add Qisda usb config" 2013-06-18 18:30:39 +00:00
esther 001fe87e02 Add Qisda usb config 
add Qisda usb config
Signed-off-by: esther <esther530@gmail.com>

Change-Id: I5b8a0e5bd2218ecdf417de357c9a7d9307c91932

Conflicts:
	adb/usb_vendors.c
 2013-06-18 11:28:08 -07:00
Stephen Hines da4c1d141a Merge "Set ATRACE_ENABLE() to '0' if not availble" 2013-06-18 01:50:34 +00:00
Tobias Grosser 9ede33233f Set ATRACE_ENABLE() to '0' if not availble 
Change-Id: Iec61d275cd7b2be65f828c282f97cc59adf4cc0b
 2013-06-17 18:38:02 -07:00
Colin Cross 755ced8064 am 44d1f3c7: am 99c1a416: resolved conflicts for merge of 95a41f6b to stage-aosp-master 
* commit '44d1f3c703015b065f009604907033aac8bedf32':
  init: fix copying boot properties
  toolbox: hide property implementation from watchprops
  init: verify size of property buffers passed to property_get
  init: move the system property writer implementation
  init: switch property_get to use __system_property_get
 2013-06-17 18:26:18 -07:00
Colin Cross 44d1f3c703 am 99c1a416: resolved conflicts for merge of 95a41f6b to stage-aosp-master 
* commit '99c1a4168ba792437f298d31cd4631ff01661476':
  init: fix copying boot properties
  toolbox: hide property implementation from watchprops
  init: verify size of property buffers passed to property_get
  init: move the system property writer implementation
  init: switch property_get to use __system_property_get
 2013-06-17 18:24:39 -07:00
Colin Cross 99c1a4168b resolved conflicts for merge of 95a41f6b to stage-aosp-master 
Change-Id: Icfae29edf989fb43a7f0b8bda188a9807f76a3b9
 2013-06-17 18:19:28 -07:00
Colin Cross 95a41f6b20 Merge changes Ia7b337e1,I7a2d8aa5,Iacc2b42b,Idf6100d1,If3fba2cc 
* changes:
  init: fix copying boot properties
  toolbox: hide property implementation from watchprops
  init: verify size of property buffers passed to property_get
  init: move the system property writer implementation
  init: switch property_get to use __system_property_get
 2013-06-18 01:11:59 +00:00
Colin Cross 5e484e9c43 init: fix copying boot properties 
The previous patch "init: verify size of property buffers passed
to property_get" incorrectly modified one of the callers,
resulting in ro.serialno, ro.bootmode, ro.baseband, and
ro.bootloader always being set to their default values.

Bug: 9469860

(cherry picked from commit 67e3663fc9)

Change-Id: Ia7b337e1fab6e334729f47ee1269e6c736615177
 2013-06-17 16:58:14 -07:00
Colin Cross 8196316411 toolbox: hide property implementation from watchprops 
(cherry picked from commit 91779634de)

Change-Id: I7a2d8aa507ac61cedc5f67c563531a7d4ec8e4c2
 2013-06-17 16:58:09 -07:00
Colin Cross a5a860ef20 init: verify size of property buffers passed to property_get 
Verify that the buffer passed as the value parameter to property_get
is always big enough.

(cherry picked from commit 88ac54a4e8)

Change-Id: Iacc2b42bfe4069e0bfcbb1c48474f30126a93139
 2013-06-17 16:58:02 -07:00
Colin Cross 993b6ceeb0 init: move the system property writer implementation 
Move the system property writer implementation into bionic to keep
it next to the reader implementation and allow for better testing.

(cherry picked from commit 9f5af63501)

Change-Id: Idf6100d1d0170751acd5163a22597912bff480f0
 2013-06-17 16:57:49 -07:00
Colin Cross 1a6f4c3bf2 init: switch property_get to use __system_property_get 
(cherry picked from commit 2deedfe0b1)

Change-Id: If3fba2cc1dd5c167b0924ddfe42dbe2e6387208a
 2013-06-17 16:57:32 -07:00
Colin Cross 67e3663fc9 init: fix copying boot properties 
The previous patch "init: verify size of property buffers passed
to property_get" incorrectly modified one of the callers,
resulting in ro.serialno, ro.bootmode, ro.baseband, and
ro.bootloader always being set to their default values.

Bug: 9469860
Change-Id: Id45bd8dd657e8d61f4cfaf7e6b2559d2bfd05181
 2013-06-17 16:20:08 -07:00
Colin Cross e80e0319ae Merge changes Ia6609116,Ie5b6fcd9,I9026e604,I4fc0502a 
* changes:
  toolbox: hide property implementation from watchprops
  init: verify size of property buffers passed to property_get
  init: move the system property writer implementation
  init: switch property_get to use __system_property_get
 2013-06-17 21:07:21 +00:00
Elliott Hughes e39057b687 am 88411498: am 520f4f06: am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB" 
* commit '88411498b3341dbf8f2976991524b1e21dedc6f6':
  adb: fix reported transfer size for transfer over 4 GiB
 2013-06-17 14:00:17 -07:00
Elliott Hughes 88411498b3 am 520f4f06: am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB" 
* commit '520f4f060325496741f600692f3582536fa43a8f':
  adb: fix reported transfer size for transfer over 4 GiB
 2013-06-17 13:58:25 -07:00
Elliott Hughes 8df29c9b61 am 1aeefcd6: am 0173ebd5: am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook, Haier, Hisense, and MTK" 
* commit '1aeefcd6900d85911028e6d3e344e338e0a05158':
  adb: add vendor ID's for Nook, Haier, Hisense, and MTK
 2013-06-17 13:56:54 -07:00
Elliott Hughes 520f4f0603 am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB" 
* commit '865bb05dd0db1531f252de5e137605beec171ca2':
  adb: fix reported transfer size for transfer over 4 GiB
 2013-06-17 13:56:04 -07:00
Elliott Hughes 1aeefcd690 am 0173ebd5: am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook, Haier, Hisense, and MTK" 
* commit '0173ebd531b2b443b56d1c12d598f2f89c95fb0a':
  adb: add vendor ID's for Nook, Haier, Hisense, and MTK
 2013-06-17 13:54:04 -07:00
Elliott Hughes 0173ebd531 am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook, Haier, Hisense, and MTK" 
* commit '5f8d9c012cf28fad57d0896b938b05e2c976073f':
  adb: add vendor ID's for Nook, Haier, Hisense, and MTK
 2013-06-17 13:51:46 -07:00
Elliott Hughes 865bb05dd0 Merge "adb: fix reported transfer size for transfer over 4 GiB" 2013-06-17 20:49:25 +00:00
Elliott Hughes 5f8d9c012c Merge "adb: add vendor ID's for Nook, Haier, Hisense, and MTK" 2013-06-17 20:47:18 +00:00
Colin Cross 91779634de toolbox: hide property implementation from watchprops 
Change-Id: Ia6609116d641d3354971ca40a16ffcab38484150
 2013-06-17 13:13:40 -07:00
Colin Cross 88ac54a4e8 init: verify size of property buffers passed to property_get 
Verify that the buffer passed as the value parameter to property_get
is always big enough.

Change-Id: Ie5b6fcd94bb908215cfd55d0c9b07f717ddb70b1
 2013-06-17 12:44:35 -07:00
Colin Cross 9f5af63501 init: move the system property writer implementation 
Move the system property writer implementation into bionic to keep
it next to the reader implementation and allow for better testing.

Change-Id: I9026e604109e30546b2849b60cab2e7e5ff00ba5
 2013-06-17 12:44:35 -07:00
Colin Cross 2deedfe0b1 init: switch property_get to use __system_property_get 
Change-Id: I4fc0502a1a5b331087618a4d2e3d90948743d7bd
 2013-06-17 12:44:35 -07:00
Jeff Smith 71150ce4ef adb: add vendor ID's for Nook, Haier, Hisense, and MTK 
Change-Id: I156ff750ef9ae66113d1e0e3ceffea047abc03b9
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
 2013-06-17 13:21:04 -05:00
The Android Open Source Project 406c3bb885 am 0c3de6af: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit '0c3de6aff3cceb6e041a46a12e596b8e8819aa15':
 2013-06-16 07:49:23 -07:00
The Android Open Source Project 0c3de6aff3 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I4ec0a42f3e59ad0bc4d26ca2b1132ec55ce6fa6d
 2013-06-16 07:44:19 -07:00
The Android Automerger 1ccbcc9633 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-16 05:55:49 -07:00
Jeff Smith d9a1430ff2 adb: fix reported transfer size for transfer over 4 GiB 
When transferring files over 4 GiB with adb, the size of the transfer
is misreported.

Change-Id: Ia3d4cae1e9f82b4f7432341820b101ea9a44f85b
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
 2013-06-15 16:03:54 -05:00
Ajay Dudani fd914ee94c am 05a52055: am 76c58893: Free file handle for /firmware/image after use 
* commit '05a52055661701c20f71124161798fdea8ea2982':
  Free file handle for /firmware/image after use
 2013-06-14 09:11:34 -07:00
Ajay Dudani 05a5205566 am 76c58893: Free file handle for /firmware/image after use 
* commit '76c5889325c2ada5dda07fd9af20a4a485978538':
  Free file handle for /firmware/image after use
 2013-06-14 08:36:02 -07:00
Colin Cross c2362101cb am 890f37da: am c620f095: Merge "init: prevent action being added to the action_queue twice" 
* commit '890f37da1050916a8dc470b25f9e1d0e7712464d':
  init: prevent action being added to the action_queue twice
 2013-06-13 22:34:13 -07:00
Colin Cross 890f37da10 am c620f095: Merge "init: prevent action being added to the action_queue twice" 
* commit 'c620f095fef62114ffdc6c0ed0749c56b5e817b8':
  init: prevent action being added to the action_queue twice
 2013-06-13 22:05:32 -07:00
Colin Cross c620f095fe Merge "init: prevent action being added to the action_queue twice" 2013-06-14 00:44:18 +00:00
Ajay Dudani 76c5889325 Free file handle for /firmware/image after use 
Change-Id: Id59e25486b45dffc87a89a961970a6e8128a5237
 2013-06-13 13:18:12 -07:00
Elliott Hughes b77ba56693 am 65d8ec09: am 6ef0dfec: Merge "Add a new test to crasher to upset dlmalloc." 
* commit '65d8ec099dbaa3e4fc56430060853f51a7687ac0':
  Add a new test to crasher to upset dlmalloc.
 2013-06-12 14:30:21 -07:00
Elliott Hughes 65d8ec099d am 6ef0dfec: Merge "Add a new test to crasher to upset dlmalloc." 
* commit '6ef0dfecca9fde5abe15ceea30e0615897d7b374':
  Add a new test to crasher to upset dlmalloc.
 2013-06-12 14:23:29 -07:00
Elliott Hughes 6ef0dfecca Merge "Add a new test to crasher to upset dlmalloc." 2013-06-12 21:21:38 +00:00
Elliott Hughes 6f40cafd9f Add a new test to crasher to upset dlmalloc. 
We should also add a test for heap corruption, but I failed to come up
with a kind of corruption that dlmalloc actually detects (rather than
just crashing accidentally).

Change-Id: I7457e732729635b171ffc44517c3de71f55608e6
 2013-06-12 14:04:34 -07:00
Torne (Richard Coles) 945ff923b7 Merge "Add webviewchromium to BOOTCLASSPATH." 2013-06-11 13:13:30 +00:00
Colin Cross 7527362eb3 am 0a0a8768: resolved conflicts for merge of c0df50af to stage-aosp-master 
* commit '0a0a8768cbc9ce36d3c9a0cc712dc8c309811565':
  fix bad return value in dhcp_do_request_*
 2013-06-10 15:16:47 -07:00
Colin Cross 0a0a8768cb resolved conflicts for merge of c0df50af to stage-aosp-master 
Change-Id: I949cce9e1f14cd33162b81fbc6728c64e2b09b7c
 2013-06-10 15:06:43 -07:00