Commit Graph

3141 Commits

Author SHA1 Message Date
Jean-Baptiste Queru 149ae11fb6 Merge "adb,fastboot: add USB support for Intel Vendor ID" 2012-01-24 07:50:12 -08:00
mgross c840653efd fastboot: set the language local string
Set the language local string to 0x409 (English US / en-us) such that
fastboot will successfully read the usb descriptor serial number string.
The usbdevfs ioctl fails when the wIndex is not initialized with the
local for the unicode of the usb descriptor string.  usbdevfs is an
obsolete interface and fastboot probably needs a re-write to use libusb
like what is in adb.

Change-Id: I3687f84643f53c736f14b3ae7793185d9b5cccc0
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
2012-01-23 13:12:23 -08:00
Johan Norberg 69ab6de333 Toolbox implementation of chown has a bad print
When the chown program fails it prints out an error message
and is describing itself as chmod. This has been corrected.

Change-Id: I2c489975f09343bdf66acbf7df6e7183c2daff78
Signed-off-by: christian bejram <christian.bejram@stericsson.com>
2012-01-20 17:28:42 -08:00
The Android Open Source Project 546dc10c1a Reconcile with ics-mr1-release
Change-Id: Ica26c90c34d9665dfd68e404893a306d43aface3
2012-01-20 10:25:51 -08:00
The Android Automerger 2eb08e4435 merge in ics-mr1-release history after reset to ics-mr1 2012-01-19 16:29:45 -08:00
The Android Open Source Project 56acfe3504 Reconcile with ics-mr1-release
Change-Id: I7d6cd74bf255c517d04c5900a38145571297f66d
2012-01-19 13:07:14 -08:00
Andrew Hsieh daafb53148 am 4779e934: Add Intel\'s vendor ID to adb
* commit '4779e9344bb62208e4772ff6486b6df564f434b8':
  Add Intel's vendor ID to adb
2012-01-19 09:55:35 -08:00
Jean-Baptiste Queru abffc7f7a8 am fa7860a2: Merge changes Iff15ac5e,I52fce957,I6c2a1d56,I929ea38b,Ia0476219,Ia9a357de,Ifb82ae2c
* commit 'fa7860a27ff79b5697ac059c4bedc4f7445500af':
  Rename LOG_ASSERT to ALOG_ASSERT
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
  Rename (IF_)LOG() to (IF_)ALOG()
2012-01-18 17:56:55 -08:00
Jean-Baptiste Queru fa7860a27f Merge changes Iff15ac5e,I52fce957,I6c2a1d56,I929ea38b,Ia0476219,Ia9a357de,Ifb82ae2c
* changes:
  Rename LOG_ASSERT to ALOG_ASSERT
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
  Rename (IF_)LOG() to (IF_)ALOG()
2012-01-18 15:37:04 -08:00
Andrew Hsieh 4779e9344b Add Intel's vendor ID to adb
Change-Id: I81da3ea11bfd44395f6895fe51e477ff1e7fa25b
2012-01-18 14:30:11 -08:00
Wu, Hao f60e863828 adb,fastboot: add USB support for Intel Vendor ID
This patch adds Intel USB Vendor ID into the support
list for adb and fastboot.

Signed-off-by: Wu, Hao <hao.wu@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
2012-01-17 12:08:06 -08:00
Steve Block 2ac29d0250 Rename LOG_ASSERT to ALOG_ASSERT
Change-Id: Iff15ac5e7ab226d437c08d23f18fd54e6793e65c
2012-01-17 17:56:20 +00:00
Steve Block 8aeb6e244a Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I52fce957db06c281e2618daa4e2ecba19974f2eb
2012-01-17 17:56:20 +00:00
Steve Block 4f07a1f826 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Change-Id: I6c2a1d56dadb7e5c69e478f4d8c7d9f2127db2af
2012-01-17 17:56:20 +00:00
Steve Block 4163b45949 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Change-Id: I929ea38bc6fe6efeefa7870c8e7e4c19cd0029b3
2012-01-17 17:56:19 +00:00
Steve Block 9786ec417f Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Change-Id: Ia0476219b71ece949595515ee07ea072ed349d73
2012-01-17 17:56:19 +00:00
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
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 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 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
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
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 863c9311d3 Reconcile with ics-mr1-release
Change-Id: I490a0a05c5e5e7696f8ebd402992047099a4877f
2012-01-12 08:56:56 -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 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 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 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 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
Vladimir Chtchetkine 8642b9b0c7 am 74159657: Cherry-picked from c13daef7b on master. Do not merge.
* commit '74159657687aadab4c82e4fd7e7a54d16c045d95':
  Cherry-picked from c13daef7b on master. Do not merge.
2012-01-10 16:19:45 -08:00
Vladimir Chtchetkine ae42982868 Cherry-picked from c4f37eed7 in master. Do not merge.
Fix the build.

Conditionally compile code that is intended to run inside the emulator only.

Change-Id: Ie82e415b2ff52395616f85871dddb38e65b0ed55
2012-01-10 16:19:09 -08:00
Vladimir Chtchetkine 7415965768 Cherry-picked from c13daef7b on master. Do not merge.
Use QEMU pipe for ADB communication when running in emulator.

Change-Id: I7934b6272c2a9825d244ce76ff65dbce6e54ebff
2012-01-10 16:03:17 -08:00