Guillaume Ranquet
dea46b6657
libusbhost: permits client polling on inotify wd
...
Modify libusbhost to expose the inotify watch descriptor to clients
This modification permits clients to add the watch descriptor to
their polling loop so that they don't have to use a dedicated
thread only for libusbhost.
Change-Id: I615bfcd56beab978135034b228d4d93337351eab
Signed-off-by: Guillaume Ranquet <guillaumex.ranquet@intel.com>
Signed-off-by: Luc Piguet-Lacroix <lucx.piguet-lacroix@intel.com>
2012-12-10 11:12:35 +01:00
Elliott Hughes
777991d939
Merge "Fixed improper size displaying in 'df' utility"
2012-12-03 07:33:38 -08:00
Colin Cross
2a2f640886
Merge "autosuspend_inited flag set even if initialization fails"
2012-12-01 20:02:34 -08:00
Kenny Root
a649fafbe8
Merge "Switch keystore to binder"
2012-11-27 11:20:55 -08:00
Kenny Root
9b82ce20eb
Merge "Document the SELinux extensions to the Android init language."
2012-11-27 11:20:38 -08:00
Kyle Russell
a26b4caf4c
autosuspend_inited flag set even if initialization fails
...
Prevents possible SIGSEGV on second autosuspend_enable attempt when
first intialization attempt fails. autosuspend_inited should only
be set once autosuspend_ops has been assigned.
Consider the first call to autosuspend_enable().
autosuspend_init() sets its inited flag to true, and attempts to
set autosuspend_ops. If all the other autosuspend_*_init() attempts
fail, autosuspend_init() returns -1, which autosuspend_enable()
will return as a failure. A second call to autosuspend_enable()
will check autosuspend_init() and see that autosuspend has already
been initialized. It will attempt to access autosuspend_ops, which
were not set in the first initialization attempt, causing a SIGSEGV.
Change-Id: Ib2d3ee62fee4c3b6d0323e5b7f3709a23c6b923f
2012-11-20 09:12:39 -05:00
Kenny Root
92781808ba
Switch keystore to binder
...
Change-Id: I1607bc1f14af5115cefd6727be3815cdcce670a8
2012-11-13 12:19:47 -08:00
jp abgrall
3ddc0059bb
am ee854b07: Merge "Allocate a UID for clatd"
...
* commit 'ee854b077766a85279fa1849b537c50837d1a204':
Allocate a UID for clatd
2012-11-12 15:57:02 -08:00
jp abgrall
ee854b0777
Merge "Allocate a UID for clatd"
2012-11-12 14:49:50 -08:00
The Android Open Source Project
1ca4b7d26a
am 270ee0c6: am ba70ed9a: Reconcile with jb-mr1-release - do not merge
...
* commit '270ee0c6c62e1bcf278892094653e7ab008b3685':
2012-11-08 06:27:03 -08:00
Xavier Ducrohet
493d04d2fe
am f621d62a: am c4244565: am d1e39491: Add usb vendor id for Teleepoch.
...
* commit 'f621d62adcbcd81d6479223d9afe47c1d966710d':
Add usb vendor id for Teleepoch.
2012-11-08 06:14:18 -08:00
The Android Open Source Project
270ee0c6c6
am ba70ed9a: Reconcile with jb-mr1-release - do not merge
...
* commit 'ba70ed9ae7dab75bde317a8dc8886da309831eca':
2012-11-07 10:24:18 -08:00
The Android Open Source Project
ba70ed9ae7
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I70866c059c12fdba45761ecbbb6e2a4cf2aa8107
2012-11-07 10:20:22 -08:00
The Android Automerger
31da9db0d1
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-06 18:04:30 -08:00
Xavier Ducrohet
f621d62adc
am c4244565: am d1e39491: Add usb vendor id for Teleepoch.
...
* commit 'c424456542cacc7d776e1adc859ed1c0e784dee0':
Add usb vendor id for Teleepoch.
2012-11-06 17:10:14 -08:00
Xavier Ducrohet
c424456542
am d1e39491: Add usb vendor id for Teleepoch.
...
* commit 'd1e39491f063626e026304ba8abe084cc43c94da':
Add usb vendor id for Teleepoch.
2012-11-06 17:07:54 -08:00
Xavier Ducrohet
d1e39491f0
Add usb vendor id for Teleepoch.
...
Change-Id: I82bbfed598fc3a886681c4139600cf487034c59c
2012-11-06 12:56:14 -08:00
The Android Open Source Project
63766a89a1
am b64246ae: am c8e3a27b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'b64246ae1b00eacd5323f8a8db7249bd726c4f33':
2012-11-06 12:27:06 -08:00
The Android Open Source Project
b64246ae1b
am c8e3a27b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'c8e3a27b43407268b2bb76b1d4fceee4fa3b314a':
init: Set ADDR_COMPAT_LAYOUT before spawning processes.
Dump 256 bytes per chunk pointed by general-purpose registers.
Wrap system calls in TEMP_FAILURE_RETRY.
Bring back ADB_EXTERNAL_STORAGE.
Revert "Upgrade to dlmalloc 2.8.5."
bluetooth: bring up with bluedroid stack
add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
2012-11-06 12:23:39 -08:00
The Android Open Source Project
c8e3a27b43
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I89230f756ce6caee4d7fa4514f47b6b0fc44d1f3
2012-11-06 12:19:18 -08:00
Stephen Smalley
3fb6110830
Document the SELinux extensions to the Android init language.
...
Change-Id: I9b066e0789c93e5147c28a60baeed91c44dd9359
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2012-11-02 15:22:34 -04:00
The Android Open Source Project
62edaa59a5
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I74d83ad681e16b5e548eb2be6af985d6349ee83e
2012-10-31 09:18:57 -07:00
Elliott Hughes
3427e80ef3
am a6fb0e05: Merge "Fix debuggerd\'s use of readdir_r(3)."
...
* commit 'a6fb0e05aa95995445c6f2b65f07db26bdbfd46c':
Fix debuggerd's use of readdir_r(3).
2012-10-30 16:57:51 -07:00
Elliott Hughes
a6fb0e05aa
Merge "Fix debuggerd's use of readdir_r(3)."
2012-10-30 15:53:18 -07:00
Elliott Hughes
c463d2cf9c
Fix debuggerd's use of readdir_r(3).
...
Change-Id: I1b178af054cefebfb774320e4b4699d6dc8bbb01
2012-10-26 16:47:09 -07:00
Nick Kralevich
6575a1625a
am 8f98c4b5: Merge "Fix dirfd crash issue in property service"
...
* commit '8f98c4b5f011db8637ce1b9361e82d59b13434f4':
Fix dirfd crash issue in property service
2012-10-23 10:46:55 -07:00
Nick Kralevich
8f98c4b5f0
Merge "Fix dirfd crash issue in property service"
2012-10-23 09:58:25 -07:00
Yi-wei Zhao
e41bc31555
Fix dirfd crash issue in property service
...
In "init: harden property service" patch, dirfd() is invoked
without checking whether opendir() return successfully. It may
fail if load_persistent_properties() is invoked before userdata
partition is mounted; then dirfd(NULL) will make init crash.
This may happen if "is_charger" is true.
Change-Id: I216fb743a3c9fa050f92fcb31b62e766346d84bb
Signed-off-by: Yi-wei Zhao <gbjc64@motorola.com>
2012-10-23 21:31:06 +08:00
Elliott Hughes
066d3f9b3b
resolved conflicts for merge of 3e5e9e9e
to jb-mr1-dev-plus-aosp
...
Change-Id: I621d0e984a266478b4297a25afd164c1275e30f9
2012-10-22 14:35:12 -07:00
Elliott Hughes
3e5e9e9ee2
Merge "Add a directory for tzdata updates."
2012-10-22 13:31:52 -07:00
Elliott Hughes
f820e85164
Add a directory for tzdata updates.
...
Bug: 7012465
Change-Id: I7e2c9965a4bcad125ca4fb788b842bd114b5619c
2012-10-19 18:10:05 -07:00
The Android Automerger
74365b18c1
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-17 16:07:48 -07:00
Zhihai Xu
a40f5e662d
am 831f8cf9: am 9f239afc: second user doesnot pickup input operations from A2DP
...
* commit '831f8cf941fa1d298652fdf95fccb7bc693b4fc4':
second user doesnot pickup input operations from A2DP
2012-10-17 10:04:46 -07:00
Zhihai Xu
831f8cf941
am 9f239afc: second user doesnot pickup input operations from A2DP
...
* commit '9f239afc3565770f39ae94c2969addb520af3a40':
second user doesnot pickup input operations from A2DP
2012-10-17 10:02:01 -07:00
Kenny Root
2a36ae5608
am 7b88a90d: Merge "Remove HAVE_SELINUX guards"
...
* commit '7b88a90da2a27e347fc16c14fa577f4ae1ef07fd':
Remove HAVE_SELINUX guards
2012-10-17 09:57:10 -07:00
Kenny Root
7b88a90da2
Merge "Remove HAVE_SELINUX guards"
2012-10-17 09:35:56 -07:00
Kenny Root
b5982bf7c6
Remove HAVE_SELINUX guards
...
Change-Id: I8272c573b3c5dc663203bafab68fad5e94d89364
2012-10-16 23:18:18 -07:00
Kenny Root
20f5daa865
resolved conflicts for merge of 44f4f8a4
to jb-mr1-dev-plus-aosp
...
Change-Id: I66988d8e87a8110ca9ab3da19870b80bbaf06eba
2012-10-16 17:51:14 -07:00
Zhihai Xu
9f239afc35
second user doesnot pickup input operations from A2DP
...
bug 7335014
Change-Id: I39e450d254647f0b84a07f38f2f2571711fca075
2012-10-16 17:32:51 -07:00
Kenny Root
44f4f8a4d2
Merge "Remove HAVE_SELINUX guards"
2012-10-16 16:33:45 -07:00
Kenny Root
b83c09812f
Remove HAVE_SELINUX guards
...
Change-Id: Idef0a784a1d237257ff4135bb1df62ff8a67ded3
2012-10-16 12:34:06 -07:00
The Android Automerger
80a99e31a0
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-16 07:00:10 -07:00
Todd Poynor
d943017995
am c907ce77: am 7b4aa677: Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev
...
* commit 'c907ce77a099f28b07b754e9f69619adbe1e345f':
init.trace.rc: Set perms for power/clock_set_rate events
2012-10-15 20:18:52 -07:00
Jean-Michel Trivi
28b032c939
am 7908567b: am 14075567: Merge "Remove force use definition for remote audio submix" into jb-mr1-dev
...
* commit '7908567b642ec5a49b9d0baa7e0285cc742ced61':
Remove force use definition for remote audio submix
2012-10-15 20:17:59 -07:00
Daniel Drown
b49183f122
Allocate a UID for clatd
...
clatd(464xlat) runs as its own UID after it drops root privs
Change-Id: I2392f8127dcd90d16b0f20ff31bcc5aa096db464
Signed-off-by: Daniel Drown <dan-android@drown.org>
2012-10-15 20:22:53 -05:00
Todd Poynor
c907ce77a0
am 7b4aa677: Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev
...
* commit '7b4aa677b1860b9a83f9cde7d71ca0d5bc193422':
init.trace.rc: Set perms for power/clock_set_rate events
2012-10-15 17:38:26 -07:00
Todd Poynor
7b4aa677b1
Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev
2012-10-15 17:36:12 -07:00
Todd Poynor
4ef6e4baa9
init.trace.rc: Set perms for power/clock_set_rate events
...
Bug: 7351763
Change-Id: I1ee3d7c9b55d1b55df6cafb1bf21f9139d964646
2012-10-15 17:16:55 -07:00
Jean-Michel Trivi
7908567b64
am 14075567: Merge "Remove force use definition for remote audio submix" into jb-mr1-dev
...
* commit '14075567de367bd109a256514119fc16e8d4cf67':
Remove force use definition for remote audio submix
2012-10-15 16:28:02 -07:00
Jean-Michel Trivi
14075567de
Merge "Remove force use definition for remote audio submix" into jb-mr1-dev
2012-10-15 16:26:28 -07:00