ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5500 commits 1 branch 0 tags 217 MiB
Commit graph

5500 commits

This branch
This branch
All branches
Author SHA1 Message Date
Colin Cross
372d668a27 am 39021a48: am 83ada447: Merge changes Ib54f39fd,I7e36edd8 
* commit '39021a48a0e0687c654423acd5a4c99a1d79440d':
  init: Retain traditional restart behavior for critical and oneshot services.
  init: Safely restart services to avoid race conditions.
 2013-06-24 15:27:43 -07:00
Colin Cross
39021a48a0 am 83ada447: Merge changes Ib54f39fd,I7e36edd8 
* commit '83ada447aed69dfcd0a88e952eced8db1e4d6584':
  init: Retain traditional restart behavior for critical and oneshot services.
  init: Safely restart services to avoid race conditions.
 2013-06-24 15:24:57 -07:00
Colin Cross
83ada447ae Merge changes Ib54f39fd,I7e36edd8 
* changes:
  init: Retain traditional restart behavior for critical and oneshot services.
  init: Safely restart services to avoid race conditions.
 2013-06-24 22:23:32 +00:00
Colin Cross
9270f12529 am a44c31cc: am e755dfd4: Merge changes I1db3137b,I0f66144e 
* commit 'a44c31cc91bce7124e896adb072a10f2740a96b4':
  toolbox: reimplement watchprops using __system_property_foreach()
  libcutils: reimplement property_list() using __system_property_foreach()
 2013-06-19 10:35:33 -07:00
Colin Cross
a44c31cc91 am e755dfd4: Merge changes I1db3137b,I0f66144e 
* commit 'e755dfd43812ebd9a0d0d6a2106316f343ffb5a2':
  toolbox: reimplement watchprops using __system_property_foreach()
  libcutils: reimplement property_list() using __system_property_foreach()
 2013-06-19 10:33:42 -07:00
Colin Cross
e755dfd438 Merge changes I1db3137b,I0f66144e 
* changes:
  toolbox: reimplement watchprops using __system_property_foreach()
  libcutils: reimplement property_list() using __system_property_foreach()
 2013-06-19 17:32:06 +00:00
Greg Hackmann
68e9b6bc94 toolbox: reimplement watchprops using __system_property_foreach() 
Internally, replace the watchlist array with a hashmap since the array
assumes properties are enumerated in a consistent order and foreach()
probably won't.  (find_nth() never guaranteed this either but it usually
worked in practice.)

Signed-off-by: Greg Hackmann <ghackmann@google.com>

(cherry picked from commit 389e358017)

Change-Id: I1db3137b130474f4bb205f01f0bdcf37cf974764
 2013-06-18 19:26:28 -07:00
Greg Hackmann
6967935eb3 libcutils: reimplement property_list() using __system_property_foreach() 
Signed-off-by: Greg Hackmann <ghackmann@google.com>

(cherry picked from commit e7bb159d16)

Change-Id: I0f66144eb8a4a48e04e4fcd125ad37f19ad94b8e
 2013-06-18 19:26:27 -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
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
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
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
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
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
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
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
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
Colin Cross
0a0a8768cb resolved conflicts for merge of c0df50af to stage-aosp-master 
Change-Id: I949cce9e1f14cd33162b81fbc6728c64e2b09b7c
 2013-06-10 15:06:43 -07:00
Colin Cross
c0df50afdb Merge "fix bad return value in dhcp_do_request_*" 2013-06-10 21:57:21 +00:00
Colin Cross
e9ab162f30 init: prevent action being added to the action_queue twice 
Property triggers may cause an action to be queued twice, resulting
in a loop in the action queue.  Keep actions that are not on the queue
in the list_empty state (act->qlist->next == act->qlist), and only
add them to the list if they are in that state.

Bug: 8335133
Change-Id: I3a3ec18176cf19cbaa3a45220a03c7560eacfe79
 2013-06-10 14:16:00 -07:00
Michael Wu
897df50f4c fix bad return value in dhcp_do_request_* 
1. bad return status make it return uninitialized prefixLength with a magic
number in android_net_utils_runDhcpCommon()
2. it will make DhcpInfoInternal.makeLinkAddress() to throw
IllegalArgumentException when try to connect a Wifi AP
3. the exception will make system reboot, of cource it random.

Change-Id: Iabc0cd5b69c1316f4eeae0aa1b8a91444dca4562
Signed-off-by: Michael Wu <michaelstay@gmail.com>
 2013-06-05 08:42:22 +08:00
Brian Carlstrom
603746f0e3 am 59fa7e10: Merge "Fixed reversed output in netstat Recv-Q Send-Q columns" 
* commit '59fa7e107d43a4ef521413ec0bb7b0c2a5525071':
  Fixed reversed output in netstat Recv-Q Send-Q columns
 2013-06-04 10:28:55 -07:00
Brian Carlstrom
59fa7e107d Merge "Fixed reversed output in netstat Recv-Q Send-Q columns" 2013-06-04 17:26:25 +00:00
Brian Carlstrom
3c412f6260 Fixed reversed output in netstat Recv-Q Send-Q columns 
Change-Id: I2bc7ac6c886808910212432497f05e34596f5e85
 2013-06-03 19:24:44 -07:00
The Android Open Source Project
54d19aa66c Reconcile with jb-mr2-release - do not merge 
Change-Id: I43fb882425fac784151bbf0a313661f3b684ac89
 2013-05-23 08:05:48 -07:00
The Android Automerger
cd07446afe merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-23 05:55:39 -07:00
Matthew Xie
5cb9a02b03 am 7e723498: Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-dev 
* commit '7e72349865db83d62f98eec8bca4b170712fe0e0':
  Add permission for bluetooth app in non-primary users
 2013-05-22 10:38:44 -07:00
Matthew Xie
7e72349865 Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-dev 2013-05-22 17:36:53 +00:00
Matthew Xie
40a91a2884 Add permission for bluetooth app in non-primary users 
bug 8954114
Change-Id: Id6a42f5a5beefa22c3cc8eecfb39a2222017a3b4
 2013-05-22 10:00:23 -07:00
Colin Cross
a9e08d3ed6 am 51a2e4d5: Merge "libsysutils: fix null pointer and memory leak issue" 
* commit '51a2e4d5d44a6f788da207dff301356e16b4e283':
  libsysutils: fix null pointer and memory leak issue
 2013-05-21 14:39:19 -07:00