Commit graph

8649 commits

Author SHA1 Message Date
Michael Wright
9eb6e1bcbc am 3888cefc: am 949bd4c2: Merge "Print ABI in backtraces."
* commit '3888cefc4d0b28707fa5f6620f05ea4954dfae83':
  Print ABI in backtraces.
2014-06-25 01:54:20 +00:00
Michael Wright
3888cefc4d am 949bd4c2: Merge "Print ABI in backtraces."
* commit '949bd4c208fb9e2ccea2cb0ed76fafef7a5cecea':
  Print ABI in backtraces.
2014-06-25 01:49:18 +00:00
Michael Wright
949bd4c208 Merge "Print ABI in backtraces." 2014-06-25 01:41:06 +00:00
Michael Wright
80f596984e Print ABI in backtraces.
This lets the stack tool figure out which toolchain to use
automatically.

Change-Id: Ia235d6904622423fe6fbc7b0315a1861e52a41ad
2014-06-24 17:14:26 -07:00
JP Abgrall
4705044243 am 31132182: am 07703339: Merge "Wait for device to disappear after "fastboot reboot"."
* commit '311321820bfbe11f88432d9b9cc8429d3f85b17b':
  Wait for device to disappear after "fastboot reboot".
2014-06-24 22:46:49 +00:00
JP Abgrall
311321820b am 07703339: Merge "Wait for device to disappear after "fastboot reboot"."
* commit '077033391bf9dc9c73bbcebf011fc63a6501674b':
  Wait for device to disappear after "fastboot reboot".
2014-06-24 22:41:31 +00:00
Elliott Hughes
1e462eb50a am b1939864: am c4a09654: Merge "Fixed pathname for connecting to debugger."
* commit 'b193986452f8b0d43d96f014926ee243e7ba27e2':
  Fixed pathname for connecting to debugger.
2014-06-24 19:35:33 +00:00
Christopher Ferris
f77cf6c698 am 5450a441: am 676f3755: Merge "Add android_memset16/android_memset32 for aarch64."
* commit '5450a4415ca5d53abbff3f01098e6e4ddee18a66':
  Add android_memset16/android_memset32 for aarch64.
2014-06-24 19:35:27 +00:00
Elliott Hughes
f6d86d7546 am d08b80cc: am 20bda70f: Merge "Add Smartisan usb config"
* commit 'd08b80ccc6f7d106a8bfc410f89e466b798e2ebe':
  Add Smartisan usb config
2014-06-24 19:35:21 +00:00
Elliott Hughes
b193986452 am c4a09654: Merge "Fixed pathname for connecting to debugger."
* commit 'c4a09654cc2c91ad27f7d29d4584bec58d75e9f8':
  Fixed pathname for connecting to debugger.
2014-06-24 18:25:08 +00:00
Christopher Ferris
5450a4415c am 676f3755: Merge "Add android_memset16/android_memset32 for aarch64."
* commit '676f37554d7bfdb33dfd4420ff82c73cc581b1bd':
  Add android_memset16/android_memset32 for aarch64.
2014-06-24 17:28:37 +00:00
Elliott Hughes
d08b80ccc6 am 20bda70f: Merge "Add Smartisan usb config"
* commit '20bda70f9a8dff764bcbad3e711a91700fc6346b':
  Add Smartisan usb config
2014-06-24 16:09:21 +00:00
Christopher Ferris
676f37554d Merge "Add android_memset16/android_memset32 for aarch64." 2014-06-24 00:22:15 +00:00
Christopher Ferris
d660d895c1 Add android_memset16/android_memset32 for aarch64.
Included new unit tests for these functions.

Bug: 15456369

Change-Id: I3fac02f61c62d15d54d0df51957680d7155e98ae
2014-06-23 19:28:33 -07:00
JP Abgrall
077033391b Merge "Wait for device to disappear after "fastboot reboot"." 2014-06-23 21:50:22 +00:00
Mark Wachsler
ec25e7bc4b Wait for device to disappear after "fastboot reboot".
This is a follow-up to commit 157b00171a.
After "fastboot reboot", "fastboot devices" was still showing the device as
connected even though it was starting to reboot; now "fastboot reboot" will
wait until the device has disconnected.

The wait timeout is 3 seconds.

Change-Id: I8066741f0be91e53f3e3f5bc968bc1b9de31db05
2014-06-24 22:34:34 +00:00
Elliott Hughes
c4a09654cc Merge "Fixed pathname for connecting to debugger." 2014-06-23 21:50:22 +00:00
Brigid Smith
20c214f857 Fixed pathname for connecting to debugger.
The debug output was still showing the pathname that worked with
gdbclient before my changes, and therefore did not work after the fact.

Change-Id: Ie12d79f5346088914ce0a70bda69780707b31d31
2014-06-24 10:04:41 -07:00
Elliott Hughes
20bda70f9a Merge "Add Smartisan usb config" 2014-06-23 21:50:22 +00:00
Riley Andrews
079c637f3d am 5b45e08a: am 7950fc47: Merge "Add ability to boot from charger mode."
* commit '5b45e08aabd6dcbab527d221584fe348c73c70d4':
  Add ability to boot from charger mode.
2014-06-23 21:40:54 +00:00
Riley Andrews
5b45e08aab am 7950fc47: Merge "Add ability to boot from charger mode."
* commit '7950fc47a76cf7fe2d5c5e1a25002cb7848cf155':
  Add ability to boot from charger mode.
2014-06-23 21:35:48 +00:00
Elliott Hughes
8e1f3f58e4 am 2c2fdae7: am 633be1f3: Merge "Remove android_atomic_swap from mips & mips64."
* commit '2c2fdae75490130b3df2c4989716381deaac0969':
  Remove android_atomic_swap from mips & mips64.
2014-06-23 20:20:13 +00:00
Elliott Hughes
2c2fdae754 am 633be1f3: Merge "Remove android_atomic_swap from mips & mips64."
* commit '633be1f37e11703be90fc2c900f548a68b8c86d7':
  Remove android_atomic_swap from mips & mips64.
2014-06-23 20:15:43 +00:00
Elliott Hughes
bad62c532c am ba467827: am 29705171: Merge "[MIPS64] add atomic-mips64"
* commit 'ba46782770743ad8331047fc839c4e98060d167c':
  [MIPS64] add atomic-mips64
2014-06-23 19:48:56 +00:00
Elliott Hughes
089d3c93ad am e09c8a06: am e1f17ebb: Merge "Fixing debuggerd header output."
* commit 'e09c8a06a278b382626c0ee8126da99821d69a8a':
  Fixing debuggerd header output.
2014-06-23 19:48:56 +00:00
Elliott Hughes
ba46782770 am 29705171: Merge "[MIPS64] add atomic-mips64"
* commit '29705171325ad923df478e41b94af812990764cd':
  [MIPS64] add atomic-mips64
2014-06-23 19:44:23 +00:00
Elliott Hughes
e09c8a06a2 am e1f17ebb: Merge "Fixing debuggerd header output."
* commit 'e1f17ebb7c0bd16c9bc48e0fae018e26e75e7d7f':
  Fixing debuggerd header output.
2014-06-23 19:44:22 +00:00
Brigid Smith
f473200d35 Fixing debuggerd header output.
PID and TID output line was missing.

Change-Id: I609af5727bc22ea0b97f3975ddb3cf0102910bc2
2014-06-23 11:03:40 -07:00
Riley Andrews
7950fc47a7 Merge "Add ability to boot from charger mode." 2014-06-23 14:50:49 +00:00
Elliott Hughes
633be1f37e Merge "Remove android_atomic_swap from mips & mips64." 2014-06-23 14:50:49 +00:00
Elliott Hughes
a74680fcc8 Remove android_atomic_swap from mips & mips64.
Looks like this got left behind in mips by mistake, and
84c3e99231 carried this over to mips64.
Clean up before it wastes any more time...

Change-Id: I6aeaa6e68be81f94065589337e2f7d3483e6e43c
2014-06-23 11:57:30 -07:00
Elliott Hughes
2970517132 Merge "[MIPS64] add atomic-mips64" 2014-06-23 14:50:49 +00:00
Riley Andrews
e4b7b294f3 Add ability to boot from charger mode.
Add the ability to boot up directly from charger mode, instead of forcing
charger mode to initiate a full restart to launch 'full' android. This
should shave a few seconds off of boot time on supported devices (just
manta for now).

Change-Id: Ieec4494d929e92806e039f834d78b9002afd15c4
2014-06-20 16:43:00 -07:00
Riley Andrews
ab2a7dcef3 am 5ff6da8c: am dbb93515: Merge "libcutils: Fix warnings in properties.c when verbose logging is enabled"
* commit '5ff6da8c6f1a9e3f2e1dbee080fb0fbc4b547ec4':
  libcutils: Fix warnings in properties.c when verbose logging is enabled
2014-06-20 23:25:30 +00:00
Riley Andrews
5ff6da8c6f am dbb93515: Merge "libcutils: Fix warnings in properties.c when verbose logging is enabled"
* commit 'dbb93515c9a1a60a6e824e789920f43d625a8c2a':
  libcutils: Fix warnings in properties.c when verbose logging is enabled
2014-06-20 23:23:21 +00:00
Riley Andrews
72f66d982a am 1fe97b3d: am 5bd578e1: Merge "cutils: Add property_get_bool, _get_int32, _get_int64"
* commit '1fe97b3d0f6dbc6376a0ebe1f66725e9f73b4442':
  cutils: Add property_get_bool, _get_int32, _get_int64
2014-06-20 22:40:40 +00:00
Colin Cross
105ecf71c2 am 72d9c0b1: am 56b1d74e: Merge "init/ueventd: adds wildcard matching for ueventd rules"
* commit '72d9c0b18ed6162b769ee07a7cd61b01cb3a2e74':
  init/ueventd: adds wildcard matching for ueventd rules
2014-06-20 22:40:37 +00:00
Riley Andrews
1fe97b3d0f am 5bd578e1: Merge "cutils: Add property_get_bool, _get_int32, _get_int64"
* commit '5bd578e10dc417e9c8d98705366456cc613b6152':
  cutils: Add property_get_bool, _get_int32, _get_int64
2014-06-20 22:05:55 +00:00
Colin Cross
72d9c0b18e am 56b1d74e: Merge "init/ueventd: adds wildcard matching for ueventd rules"
* commit '56b1d74e27772b7e1fa759a252ffecd9a7b03dc9':
  init/ueventd: adds wildcard matching for ueventd rules
2014-06-20 21:24:40 +00:00
Riley Andrews
5bd578e10d Merge "cutils: Add property_get_bool, _get_int32, _get_int64" 2014-06-20 20:43:43 +00:00
Colin Cross
56b1d74e27 Merge "init/ueventd: adds wildcard matching for ueventd rules" 2014-06-20 20:43:43 +00:00
Igor Murashkin
d8f2a8d34a cutils: Add property_get_bool, _get_int32, _get_int64
* Read out system properties with same syntax as SystemProperties.java
* Also adds unit test suite to validate correctness of properties
* Also fixes buffer overrun in property_get

(cherry picked from commit d4507e9246)

Change-Id: Ifd42911f93e17da09e6ff1298e8875e02f3b6608
2014-06-20 20:01:49 +00:00
Ruchi Kandoi
de7bdc9424 am 1a57b1d6: am c40b9f00: Merge "healthd: UEVENT_MSG_LEN is changed from 1048 to 2048 in compliance with BUFFER_LEN in the kobject_uevent in kernel."
* commit '1a57b1d6cb65ac496f1877d41ed6a69b79056e2a':
  healthd: UEVENT_MSG_LEN is changed from 1048 to 2048 in compliance with BUFFER_LEN in the kobject_uevent in kernel.
2014-06-20 17:10:57 +00:00
Ruchi Kandoi
1a57b1d6cb am c40b9f00: Merge "healthd: UEVENT_MSG_LEN is changed from 1048 to 2048 in compliance with BUFFER_LEN in the kobject_uevent in kernel."
* commit 'c40b9f0021c159cc12119c6f92d8fe664ac677f8':
  healthd: UEVENT_MSG_LEN is changed from 1048 to 2048 in compliance with BUFFER_LEN in the kobject_uevent in kernel.
2014-06-20 17:08:34 +00:00
Elliott Hughes
d3ef8f416b am 2520f1eb: am 37d7fdbb: Merge "Maps output now marks the fault address location."
* commit '2520f1eb9323ba2129c001cf5658c9e7912ae2a1':
  Maps output now marks the fault address location.
2014-06-20 16:45:04 +00:00
Elliott Hughes
2520f1eb93 am 37d7fdbb: Merge "Maps output now marks the fault address location."
* commit '37d7fdbb7491aa91b56035285cb56c0630dd5909':
  Maps output now marks the fault address location.
2014-06-20 16:42:06 +00:00
Brigid Smith
2e8290463e Maps output now marks the fault address location.
If the fault address is not within a mapped region, it logs an error
message after the output.  Otherwise, it prefixes the location of the
fault address with "--->" to make it easier to locate.

Change-Id: I330adaade4402ffeb09f1a6d34a944c2f054d06d
2014-06-20 09:30:16 -07:00
Daniel Leung
c0c1ffea58 init/ueventd: adds wildcard matching for ueventd rules
The sysfs nodes can change from devices to devices for
a particular class of peripheral. Some of them even change
after suspend/resume, e.g. rfkill for USB bluetooth adapters.

This patch adds to the way how ueventd rules with wildcard are
handled. In addition to matching the prefix with a trailing
wildcard, now rules can have wildcard anywhere in the rule.
The wildcard matching is implemented using fnmatch(), where
its matching is simliar to shell pathname expansion. It suits
this particular usage model well. To avoid abuse, the number of
slashes has to match between path name and the rule.

For example, instead of creating a rule to match:

  /sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.3/2-1.3:1.0/bluetooth/hci0/rfkill*

, this would suffice:

  /sys/devices/pci0000:00/0000:00:1d.0/*/*/*/*/bluetooth/hci0/rfkill*

The prefix matching behavior is retained, such that those
rules do not have to pay for processing penalty with fnmatch().

Change-Id: I3ae6a39c838f6d12801cb71958e481b016f731f5
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
2014-06-20 09:28:37 -07:00
Riley Andrews
dbb93515c9 Merge "libcutils: Fix warnings in properties.c when verbose logging is enabled" 2014-06-20 02:09:57 +00:00
Igor Murashkin
1f7f70a629 libcutils: Fix warnings in properties.c when verbose logging is enabled
Change-Id: I07c5eb59b9395734ad3fc25eba753564c0f096a0
2014-06-20 15:57:09 -07:00