Commit graph

3242 commits

Author SHA1 Message Date
Steve Block
66b68757f6 Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Change-Id: Ia9a357dec5ad12eea93fd03401a3b02b38e4e94f
2012-01-17 17:56:18 +00:00
Steve Block
61fbcbe976 Rename (IF_)LOG() to (IF_)ALOG()
Change-Id: Ifb82ae2c242becaffa3cf19e548b526e6616c2c7
2012-01-17 17:56:18 +00:00
David 'Digit' Turner
ee508560cc Merge "libcutils: Use proper private header to access C library's <time.h> extension" 2012-01-14 04:36:06 -08:00
The Android Automerger
b8625abd9c merge in ics-mr1-release history after reset to ics-mr1 2012-01-13 16:19:04 -08:00
Benoit Goby
efa5c400e9 am 37a5ecfb: resolved conflicts for merge of f134ee36 to ics-mr1-plus-aosp
* commit '37a5ecfb84673673ba19893a7dfdb51d8c6406bd':
  HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE
2012-01-13 12:08:12 -08:00
Benoit Goby
37a5ecfb84 resolved conflicts for merge of f134ee36 to ics-mr1-plus-aosp
Change-Id: I7fee3ba108c72450a7f19dee036068cf3783e2fd
2012-01-13 12:02:17 -08:00
Benoit Goby
f134ee366f Merge "HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE" into ics-mr1 2012-01-13 11:46:51 -08:00
Jean-Baptiste Queru
f124435c46 am 82dd6af8: am e7b1f132: Merge "rmmod: fix full path syntax"
* commit '82dd6af84676f1ea6f67ce6fbd2c5cea7a8aa601':
  rmmod: fix full path syntax
2012-01-13 11:30:24 -08:00
Jean-Baptiste Queru
82dd6af846 am e7b1f132: Merge "rmmod: fix full path syntax"
* commit 'e7b1f132c2a324af89080bc43968b7222b40ddfa':
  rmmod: fix full path syntax
2012-01-13 11:27:28 -08:00
Jean-Baptiste Queru
e7b1f132c2 Merge "rmmod: fix full path syntax" 2012-01-13 07:47:26 -08:00
David 'Digit' Turner
7913bc05be libcutils: Use proper private header to access C library's <time.h> extension
The strftime_tz() function is not a standard C library function and should not
appear in <time.h>. Instead, it is being moved to <bionic_time.h>, a private
header only available to platform libraries.

Change-Id: I4dc18939b9380725dfaa20c9e417296363bc52f4
2012-01-13 13:38:40 +01:00
Scott Anderson
7e4c303fe0 Fix hd command so it doesn't error out on EOF
hd would error out on files that were not a multiple of its read
buffer size (4096).  For example:
Read error on init.rc, offset 17040 len 4096, No such file or directory

The fix is to stop reading on EOF instead of treating it as an
error.

Signed-off-by: Scott Anderson <saa@google.com>

(cherry picked from commit a9fac4155f)

Change-Id: Ib2af725fc39e96c2f81559f61979d451604d4817
2012-01-12 15:17:07 -08:00
The Android Automerger
4a404c113e merge in ics-mr1-release history after reset to ics-mr1 2012-01-12 14:02:11 -08:00
Benoit Goby
01c76f5400 HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE
Export androidboot.modelno command line parameter as ro.boot.modelno
property, so that we can set the USB iProduct string to the correct
value on Stingray.

Bug: 5853250
Change-Id: Idc413f15dc4d9d02027589d1b11bdf50e0a79ccc
2012-01-12 13:24:19 -08:00
Glenn Kasten
828bf0cdf4 Use audio_format_t consistently
Change-Id: I7eb489b1c1cbe9bfadd43cd7645da86b90fab652
2012-01-12 13:20:35 -08:00
Scott Anderson
e437f552d2 Merge "Add md5 command to toolbox." 2012-01-12 12:06:52 -08:00
Tanguy Pruvot
ec4db51f88 rmmod: fix full path syntax
rmmod /system/modules/multitouch.ko
rmmod: delete_module '/multitouch' failed (errno 2)

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
2012-01-12 20:44:02 +01:00
The Android Open Source Project
877e39608d am 863c9311: Reconcile with ics-mr1-release
* commit '863c9311d3f3912f02931265906b08ac780f2a1d':
2012-01-12 09:00:18 -08:00
The Android Open Source Project
863c9311d3 Reconcile with ics-mr1-release
Change-Id: I490a0a05c5e5e7696f8ebd402992047099a4877f
2012-01-12 08:56:56 -08:00
Scott Anderson
d0455c952d Add md5 command to toolbox.
This command outputs the MD5 for specified files.  The output is
in the same form as the md5sum command on Linux.

Change-Id: Ie0e6faf678469ac886bba8b46d98c0e54976a1ed
Signed-off-by: Scott Anderson <saa@google.com>
2012-01-11 18:13:26 -08:00
The Android Automerger
cffb062ceb merge in ics-mr1-release history after reset to ics-mr1 2012-01-11 16:30:02 -08:00
James Dong
dae26c6ac4 am 3e9c9ac5: am 032afc1d: Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1
* commit '3e9c9ac5ee7a36653b90cb86eb6445496b536c16':
  Close a security hole - do not give world readable/writable access to /data/drm
2012-01-11 16:19:37 -08:00
James Dong
3e9c9ac5ee am 032afc1d: Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1
* commit '032afc1d52289f486538c9ed53f17b9889ea94df':
  Close a security hole - do not give world readable/writable access to /data/drm
2012-01-11 16:18:11 -08:00
James Dong
032afc1d52 Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1 2012-01-11 16:16:07 -08:00
Xavier Ducrohet
a33c6ee92b am e0b55791: am 07ad9f2a: Add USB Vendor ID for Fujitsu and Lumigon.
* commit 'e0b557915123b7ad022ff5d0a7a3d4dd2ee7c2fe':
  Add USB Vendor ID for Fujitsu and Lumigon.
2012-01-11 12:05:16 -08:00
Xavier Ducrohet
e0b5579151 am 07ad9f2a: Add USB Vendor ID for Fujitsu and Lumigon.
* commit '07ad9f2a127b2836c7d45a503a5f3ef7517218f3':
  Add USB Vendor ID for Fujitsu and Lumigon.
2012-01-11 12:03:31 -08:00
Xavier Ducrohet
07ad9f2a12 Add USB Vendor ID for Fujitsu and Lumigon.
Change-Id: Icd013b362366815527834cbf54aa4ecac2b7750d
2012-01-11 11:55:45 -08:00
Dima Zavin
ed8d4a9c59 am f4d9bc4f: am f90b0e04: rootdir: convert all usages of to
* commit 'f4d9bc4ffec8e878429a1341dfff33bc02a59a0e':
  rootdir: convert all usages of $prop to ${prop}
2012-01-11 09:36:53 -08:00
Dima Zavin
7574a68414 am 37080d00: am 84bf9af7: init: use init\'s property expansion code for setprop/write
* commit '37080d0045009c6161ea0fb52272b6c920fa0da7':
  init: use init's property expansion code for setprop/write
2012-01-11 09:36:52 -08:00
Dima Zavin
1a9878a049 am 920d6d8a: am 78a1b1fe: init: delay importing files until after parsing the current file
* commit '920d6d8ab23fc4c8043294f005ecab47b705d7b7':
  init: delay importing files until after parsing the current file
2012-01-11 09:36:52 -08:00
Dima Zavin
b97caf8543 am 96e9a260: am 5511c84a: init: export all androidboot cmd line values as ro.boot.xx props
* commit '96e9a2602adadf79cf2b319c71562d450fc6c544':
  init: export all androidboot cmd line values as ro.boot.xx props
2012-01-11 09:36:51 -08:00
Dima Zavin
faa19e45fc am d7abdb21: am 3e7b7739: init: import the hardware specific init file in init.rc
* commit 'd7abdb21b3201de10bde3347e6de443f44f362ca':
  init: import the hardware specific init file in init.rc
2012-01-11 09:36:51 -08:00
Dima Zavin
d81200a86e am 079d56d0: (-s ours) am a6235eac: init: allow init file imports to use properties in names
* commit '079d56d0bdcbc04672e83557d06d716eaef44d4f':
  init: allow init file imports to use properties in names
2012-01-11 09:36:50 -08:00
Dima Zavin
f15671c505 am 82d5f40d: (-s ours) am d7634c9c: init: initialize property area early at boot
* commit '82d5f40d32d8188ba6963034636a9f2353f12ffa':
  init: initialize property area early at boot
2012-01-11 09:33:59 -08:00
Dima Zavin
f4d9bc4ffe am f90b0e04: rootdir: convert all usages of to
* commit 'f90b0e04a61ab3bf5239afb2f7157aabe5fbca8f':
  rootdir: convert all usages of $prop to ${prop}
2012-01-11 07:09:59 -08:00
Dima Zavin
37080d0045 am 84bf9af7: init: use init\'s property expansion code for setprop/write
* commit '84bf9af758c84da7d9ff2929bce06bf2b2f239b8':
  init: use init's property expansion code for setprop/write
2012-01-11 07:09:58 -08:00
Dima Zavin
920d6d8ab2 am 78a1b1fe: init: delay importing files until after parsing the current file
* commit '78a1b1fe1ab76964e35b4a4788238b197bfd613d':
  init: delay importing files until after parsing the current file
2012-01-11 07:09:58 -08:00
Dima Zavin
96e9a2602a am 5511c84a: init: export all androidboot cmd line values as ro.boot.xx props
* commit '5511c84a50617d1b3c280beb49de38ed1aae21c6':
  init: export all androidboot cmd line values as ro.boot.xx props
2012-01-11 07:09:57 -08:00
Dima Zavin
d7abdb21b3 am 3e7b7739: init: import the hardware specific init file in init.rc
* commit '3e7b7739e3d4d7aaaa363645501036dafcc30ed3':
  init: import the hardware specific init file in init.rc
2012-01-11 07:09:56 -08:00
Dima Zavin
079d56d0bd am a6235eac: init: allow init file imports to use properties in names
* commit 'a6235eacf4b06b14b19125618d7aca570dbc02b0':
  init: allow init file imports to use properties in names
2012-01-11 07:09:55 -08:00
Dima Zavin
82d5f40d32 am d7634c9c: init: initialize property area early at boot
* commit 'd7634c9cdad7bec39294a993b0bc898eaf709829':
  init: initialize property area early at boot
2012-01-11 07:09:55 -08:00
Dima Zavin
f90b0e04a6 rootdir: convert all usages of $prop to ${prop}
Change-Id: Ic2472606e869d23c0f499a192cd7bb21ca3cf5b5
Signed-off-by: Dima Zavin <dima@android.com>
2012-01-11 04:36:13 -08:00
Dima Zavin
84bf9af758 init: use init's property expansion code for setprop/write
Change-Id: I3c284860cc8d5106ac2b086e62baeb6263873935
Signed-off-by: Dima Zavin <dima@android.com>
2012-01-11 04:36:09 -08:00
Dima Zavin
78a1b1fe1a init: delay importing files until after parsing the current file
If we process the import directive inline, then the ordering of the
commands for the "on xxx" sections would be a little unexpected. The
init.rc files do not really have an implied  order as to which section
appears and gets processed first. The init code itself provides that
ordering explicitly. For the user, the expectation is that if both the
current file and the imported file define a section (e.g. "on init"),
then the commands in the current file will be executed first, and then
the ones from the imported file(s).

The current implementation did not do that. It processed the import
directive inline, and thus the imported (i.e. dependent) files would
appear first in the command lists for the sections. This created
unintended side effects and the solution would have been to try and
put the import lines somewhere in the middle of the init file. This
would be difficult to notice and hard to extract the dependencies.

To solve this, we add the imports to a list for each file being parsed
and process the list after finishing parsing the file. This provides
predictable order for imports and provides a logical flow from the
user perspective: the currently parsed file gets to run its commands
before the files being imported.

Change-Id: I06dc35ff286314060e16b18923683cd2787269de
Signed-off-by: Dima Zavin <dima@android.com>
2012-01-11 04:36:06 -08:00
Dima Zavin
5511c84a50 init: export all androidboot cmd line values as ro.boot.xx props
Also, clean up how we initialize the ro.xx properties and process
the kernel command line.

Change-Id: Iedda6c90e31340a189171a44b2767480403354f7
Signed-off-by: Dima Zavin <dima@android.com>
2012-01-11 04:36:02 -08:00
Dima Zavin
3e7b7739e3 init: import the hardware specific init file in init.rc
This removes the hardcoding of the file import in init and instead
allows the init.rc file to fully control what is loaded.

Change-Id: I933e5bbab57f1e8705a370d660f92c6508da94d2
Signed-off-by: Dima Zavin <dima@android.com>
2012-01-11 04:35:58 -08:00
Dima Zavin
a6235eacf4 init: allow init file imports to use properties in names
Adds new property syntax in init files during init file filename
expansion during the import command:
${prop.name}

So, one can do:  import /init.${ro.hardware}.usb.rc

Should convert other usages of property names to use the new function.

Change-Id: I9205d7d7a2da620bc8e6b89ac0eb554fad53ded3
Signed-off-by: Dima Zavin <dima@android.com>
2012-01-11 04:35:53 -08:00
Dima Zavin
d7634c9cda init: initialize property area early at boot
The property service is still started later, but the property area
and the initial boot properties are initialized before the init.rc
file is processed. This allows init.rc files to have access to boot
properties during parsing.

Change-Id: Iae9ed1093c821831a864b39ae6bc697e62b94757
Signed-off-by: Dima Zavin <dima@android.com>
2012-01-11 04:35:49 -08:00
Vladimir Chtchetkine
729eb83d68 am 88ffed14: (-s ours) am ae429828: Cherry-picked from c4f37eed7 in master. Do not merge.
* commit '88ffed14ce314a8e1feb17b701dce8074516f92c':
  Cherry-picked from c4f37eed7 in master. Do not merge.
2012-01-10 16:30:38 -08:00
Vladimir Chtchetkine
88ffed14ce am ae429828: Cherry-picked from c4f37eed7 in master. Do not merge.
* commit 'ae4298286896cbef22b2af285a3f651e8f498185':
  Cherry-picked from c4f37eed7 in master. Do not merge.
2012-01-10 16:28:42 -08:00