Commit graph

4167 commits

Author SHA1 Message Date
Jean-Baptiste Queru
bb0d0721e6 am 94938c9d: am ed2e672f: Merge "Print strerror for file read errors during flashing"
* commit '94938c9d60d6467ec40df4254beadc50bb787934':
  Print strerror for file read errors during flashing
2012-08-20 10:29:39 -07:00
Jean-Baptiste Queru
c3a4a054a9 am 3af04b71: am 7c386a61: Merge "Extend and document the "wait" command"
* commit '3af04b71e51e89af02a1fe526e4fc32dce0100d3':
  Extend and document the "wait" command
2012-08-20 10:29:38 -07:00
Jean-Baptiste Queru
80da83ac31 am cd82a6fe: am 36b1399d: Merge "diskconfig: Add missing include for loff_t"
* commit 'cd82a6fea05d1fa06cb0ac56d2dbb27b013b8eaa':
  diskconfig: Add missing include for loff_t
2012-08-20 10:29:37 -07:00
Jean-Baptiste Queru
94938c9d60 am ed2e672f: Merge "Print strerror for file read errors during flashing"
* commit 'ed2e672f3b929ac49617de11e6530c812b082eb6':
  Print strerror for file read errors during flashing
2012-08-20 09:41:54 -07:00
Jean-Baptiste Queru
3af04b71e5 am 7c386a61: Merge "Extend and document the "wait" command"
* commit '7c386a610d9164c12932452d1ff671e070956ec1':
  Extend and document the "wait" command
2012-08-20 09:41:53 -07:00
Jean-Baptiste Queru
cd82a6fea0 am 36b1399d: Merge "diskconfig: Add missing include for loff_t"
* commit '36b1399d8cee09d4ffde3bf958322ab9556b8ebe':
  diskconfig: Add missing include for loff_t
2012-08-20 09:41:52 -07:00
Jean-Baptiste Queru
ed2e672f3b Merge "Print strerror for file read errors during flashing" 2012-08-20 09:19:09 -07:00
Jean-Baptiste Queru
7c386a610d Merge "Extend and document the "wait" command" 2012-08-20 09:18:38 -07:00
Jean-Baptiste Queru
36b1399d8c Merge "diskconfig: Add missing include for loff_t" 2012-08-20 09:18:06 -07:00
Joe Onorato
ab163a9a17 am c56f4285: am a11f4bcf: Merge changes I5006b467,I0118cebf,Ibc792367
* commit 'c56f428530a307c850dc99024d23f7e5ebbf92d3':
  Support for multiple modules with the same name is going away.
  Fix build by removing TAGS from host module
  libext4_utils on host is now called libext4_utils_host so there is no name conflict
2012-08-17 00:53:14 -07:00
Joe Onorato
c56f428530 am a11f4bcf: Merge changes I5006b467,I0118cebf,Ibc792367
* commit 'a11f4bcfd4d40673bc97d81eb80e201359ade1e6':
  Support for multiple modules with the same name is going away.
  Fix build by removing TAGS from host module
  libext4_utils on host is now called libext4_utils_host so there is no name conflict
2012-08-17 00:51:12 -07:00
Joe Onorato
a11f4bcfd4 Merge changes I5006b467,I0118cebf,Ibc792367
* changes:
  Support for multiple modules with the same name is going away.
  Fix build by removing TAGS from host module
  libext4_utils on host is now called libext4_utils_host so there is no name conflict
2012-08-17 00:38:58 -07:00
Jeff Sharkey
de980f27a7 Omit multiuser.c from Windows builds.
Change-Id: I0cee35373e33084e4fc65a1d5c0b611c6fa82346
2012-08-16 17:16:43 -07:00
Jeff Sharkey
2be5338a84 Merge "Multi-user external storage support." into jb-mr1-dev 2012-08-16 14:33:00 -07:00
Scott Anderson
edb2d634b3 Merge "ueventd.rc: Add /dev/uhid for bluedroid" into jb-mr1-dev 2012-08-16 12:22:51 -07:00
Jeff Sharkey
885342a0f2 Multi-user external storage support.
Remount rootfs as recursively shared, so that mount changes are
propagated into child namespaces.  Mount external storage for access
from adb.

Clean multi-user dependencies for use in Dalvik.  Also define
external storage paths.

Bug: 6925012
Change-Id: I375de581a63f4f36667894c56a34a9dd45361e8f
2012-08-15 21:10:07 -07:00
Joe Onorato
5069b01e21 Support for multiple modules with the same name is going away.
Change-Id: I5006b467978071f9107babe532efa71d05061580
2012-08-15 19:52:52 -07:00
Mike J. Chen
1926c15a12 Fix build by removing TAGS from host module
Change-Id: I0118cebff021b435baea0b46dd3c43250ef96632
Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-08-15 19:52:52 -07:00
Joe Onorato
2ffe3c8ac4 libext4_utils on host is now called libext4_utils_host so there is no name conflict
Change-Id: Ibc7923676925ed6942b3f672ee764cfaa98ee96e
2012-08-15 19:52:52 -07:00
Scott Anderson
3ad289dca6 ueventd.rc: Add /dev/uhid for bluedroid
Change-Id: Ica71265856fce1abc0a0ba9c0b1ca016510c61b7
Signed-off-by: Scott Anderson <saa@android.com>
2012-08-15 15:02:00 -07:00
Jean-Baptiste Queru
e92372ba9e resolved conflicts for merge of 2237ca4c to jb-mr1-dev
Change-Id: I04982ff2b092274b940a621b238c2246349aa85e
2012-08-15 10:01:12 -07:00
Jean-Baptiste Queru
d7f78e88b5 am e3bdaeb6: am 2765e4fb: Merge "Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS"
* commit 'e3bdaeb603ab7ac941b35b41856c6b8ebf47c6bb':
  Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS
2012-08-15 09:37:56 -07:00
Jean-Baptiste Queru
ef1945f8e9 am 417e3041: am 8124e073: Merge "Fix unused parameter warnings"
* commit '417e3041b8b6ba9582c2e4d2003cfcd77435fc21':
  Fix unused parameter warnings
2012-08-15 09:37:55 -07:00
Jean-Baptiste Queru
5731de9620 am 83c4398b: am cc12ed32: Merge "[MIPS] debuggerd and libcorkscrew support"
* commit '83c4398b4adb5c2cfaf6487699a8b94901ce0fb1':
  [MIPS] debuggerd and libcorkscrew support
2012-08-15 09:37:54 -07:00
Jean-Baptiste Queru
2237ca4c66 am 2290dd41: Merge "Fixing signed/unsigned comparison warnings"
* commit '2290dd418b4ddcb12027fa4616affe64eb92ad1e':
  Fixing signed/unsigned comparison warnings
2012-08-15 09:31:25 -07:00
Jean-Baptiste Queru
e3bdaeb603 am 2765e4fb: Merge "Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS"
* commit '2765e4fb39af2f8260de1177027e292f2a7198bd':
  Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS
2012-08-15 09:31:24 -07:00
Jean-Baptiste Queru
417e3041b8 am 8124e073: Merge "Fix unused parameter warnings"
* commit '8124e0736208c47a74767170d31e3c24e0f47504':
  Fix unused parameter warnings
2012-08-15 09:31:23 -07:00
Jean-Baptiste Queru
83c4398b4a am cc12ed32: Merge "[MIPS] debuggerd and libcorkscrew support"
* commit 'cc12ed3241a4081970cdd70f88d57cb4d3bc19f2':
  [MIPS] debuggerd and libcorkscrew support
2012-08-15 09:31:21 -07:00
Iliyan Malchev
a8f1e11bcc Merge "bluetooth: bring up with bluedroid stack" into jb-mr1-dev 2012-08-15 09:20:33 -07:00
Jean-Baptiste Queru
2290dd418b Merge "Fixing signed/unsigned comparison warnings" 2012-08-15 09:15:22 -07:00
Jean-Baptiste Queru
2765e4fb39 Merge "Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS" 2012-08-15 08:52:09 -07:00
Jean-Baptiste Queru
8124e07362 Merge "Fix unused parameter warnings" 2012-08-15 08:45:48 -07:00
Jean-Baptiste Queru
cc12ed3241 Merge "[MIPS] debuggerd and libcorkscrew support" 2012-08-15 08:44:59 -07:00
Jeonghoon lim
e953e9657c bluetooth: bring up with bluedroid stack
- change permission of "bluetooth." property to AID_BLUETOOTH

Change-Id: Ifcd97f136cfc3372412fe500e4f800d1bbbd065c
2012-08-15 01:34:31 -07:00
Keun-young Park
847cb4d125 am 8f19b11a: am c4c731e7: Merge "[MIPS] Enable SD-card functionality to work"
* commit '8f19b11a42423ecd4ac8373041f64cb3001caf78':
  [MIPS] Enable SD-card functionality to work
2012-08-14 18:29:15 -07:00
Keun-young Park
8f19b11a42 am c4c731e7: Merge "[MIPS] Enable SD-card functionality to work"
* commit 'c4c731e78ca1a3527093a35280381616d1cb667d':
  [MIPS] Enable SD-card functionality to work
2012-08-14 18:27:25 -07:00
Keun-young Park
c4c731e78c Merge "[MIPS] Enable SD-card functionality to work" 2012-08-14 17:30:07 -07:00
Benoit Goby
5c8574b512 init: Fix mkdir command when using ISUID or ISGID bit
On first boot, the directory is created with root:root ownership and
then chowned. chown clears the ISUID and ISGID bits, so we need to chmod
the directory again after chown.

Change-Id: I02dfe7a19a637678256b4e7cc09e6b5431e6f11e
2012-08-14 15:51:44 -07:00
Chris Dearman
6736eb1829 Use sigemptyset to initialise signal mask as it is more portable.
Referencing sa_restorer fails on MIPS

Change-Id: I81c9ed5ef027a9d5258942ffcecb96e3f787e93c
Signed-off-by: Chris Dearman <chris@mips.com>
2012-08-14 15:30:39 -07:00
Jeff Sharkey
90b80de5a7 Merge "Support shared-subtree and bind mount flags." into jb-mr1-dev 2012-08-14 14:17:45 -07:00
Jeff Sharkey
e50ac5f777 Support shared-subtree and bind mount flags.
Bug: 6925012
Change-Id: Id8d887d17c6b1b2f90cfd1a1de991ccaba730b7d
2012-08-14 12:38:14 -07:00
Edwin Vane
29bdc876e4 Fixing signed/unsigned comparison warnings
Clang turned up some signed/unsigned comparison warnings. These warnings
have been fixed by cleaning up sdcard slightly:
- Don't use negative numbers for invalid gid/uid.
- sdcard takes a fixed number of arguments now so assert on that instead
  of using a for loop.
  - Also fixed usage string to reflect this fact.

Change-Id: Iee58a8e9aaedb3d40ad7dfeef63d8cd1fe1cd248
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
2012-08-14 13:16:55 -04:00
Jean-Baptiste Queru
96539e8153 am ee0d281a: am c95c15b1: Merge "Char device /dev/dri/card0 was not created during startup."
* commit 'ee0d281a3e5fe611bdda23db18fa0e5684ee43ed':
  Char device /dev/dri/card0 was not created during startup.
2012-08-14 08:41:16 -07:00
Jean-Baptiste Queru
ee0d281a3e am c95c15b1: Merge "Char device /dev/dri/card0 was not created during startup."
* commit 'c95c15b1923611f48c44c18ad158e57b9d915fdf':
  Char device /dev/dri/card0 was not created during startup.
2012-08-14 08:39:22 -07:00
Jean-Baptiste Queru
c95c15b192 Merge "Char device /dev/dri/card0 was not created during startup." 2012-08-14 08:06:44 -07:00
Jeff Sharkey
70e995fb8c Merge "Source and destination paths for sdcard." into jb-mr1-dev 2012-08-13 17:06:21 -07:00
Jeff Sharkey
e169bd05ec Source and destination paths for sdcard.
Enables init.rc to provide both paths, instead of hard-coding the
destination.

Bug: 6925012
Change-Id: I666cde710baad965b98619b68fcbcbb104973da3
2012-08-13 16:58:39 -07:00
Jean-Baptiste Queru
93be76f5c0 am e8e73b01: am 311a4758: Merge "Remove system/core\'s remnants of SH support."
* commit 'e8e73b01399e8d3c3fc6b94d26ef9cc49b33dda8':
  Remove system/core's remnants of SH support.
2012-08-13 16:03:30 -07:00
Kenny Root
ba822edb30 am 02e9f8d5: am 53dab583: Merge "Make setenforce usage function static."
* commit '02e9f8d5aa390d89f79b2b3bb8630af4062b4d2c':
  Make setenforce usage function static.
2012-08-13 16:03:25 -07:00
Stephen Hines
2a1067d144 am 753b96cf: am dd56039c: Merge "Fixed an unused param warning in logcat"
* commit '753b96cf67f3eaf716510600516c3c593a1ae5e1':
  Fixed an unused param warning in logcat
2012-08-13 16:03:19 -07:00