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
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
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
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
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
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
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
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
Ruchi Kandoi
c40b9f0021
Merge "healthd: UEVENT_MSG_LEN is changed from 1048 to 2048 in compliance with BUFFER_LEN in the kobject_uevent in kernel."
2014-06-20 02:04:52 +00:00
Elliott Hughes
37d7fdbb74
Merge "Maps output now marks the fault address location."
2014-06-20 02:04:52 +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
Riley Andrews
94fa20058f
am 4f5392cb: Merge "Make indentation sane in init.rc"
...
* commit '4f5392cb6c09618b968a4c86bbde079bef57afd1':
Make indentation sane in init.rc
2014-06-20 01:32:24 +00:00
Elliott Hughes
e1f17ebb7c
Merge "Fixing debuggerd header output."
2014-06-20 00:28:52 +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
4f5392cb6c
Merge "Make indentation sane in init.rc"
2014-06-20 00:06:24 +00:00
Riley Andrews
6dfdc7cd0c
Make indentation sane in init.rc
...
Change-Id: Ic632fbe1423eeef7ec958877d74db7b87fc385c6
2014-06-19 17:13:30 -07:00
Ruchi Kandoi
04db8a55b8
healthd: UEVENT_MSG_LEN is changed from 1048 to 2048 in compliance with
...
BUFFER_LEN in the kobject_uevent in kernel.
Change-Id: Ia9f4b520847d40fe4e032875dfb79bd063bc723d
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2014-06-19 13:16:50 -07:00
Elliott Hughes
c28e3c310c
am a4fb975e: Merge "Fix debuggerd "format \'%p\'" build breakage."
...
* commit 'a4fb975e3d85b7668aa6f564c6a0d4d85f550f2e':
Fix debuggerd "format '%p'" build breakage.
2014-06-19 18:53:10 +00:00
Elliott Hughes
dc0261f9d1
am 030ba83c: Merge "Updated non-ARM archs to reflect logging changes."
...
* commit '030ba83c28c4d6faa23ccb20d1001b9be6464c3a':
Updated non-ARM archs to reflect logging changes.
2014-06-19 18:39:38 +00:00
Elliott Hughes
a0619be0f6
am 32cd6ec6: Merge "Removed log.quiet and log = NULL cases from debuggerd."
...
* commit '32cd6ec6a71a2e022fc39278287f1b8751338b0e':
Removed log.quiet and log = NULL cases from debuggerd.
2014-06-19 18:05:02 +00:00
Elliott Hughes
32cd6ec6a7
Merge "Removed log.quiet and log = NULL cases from debuggerd."
2014-06-19 17:43:22 +00:00
Brigid Smith
50eb546ec1
Removed log.quiet and log = NULL cases from debuggerd.
...
Now the functionality implemented by these semi-confusing cases has been
replaced with the same logtype enum behavior that is easier to
understand, and cases that used log-looking behavior to print to logcat
(when log = NULL) now use the more transparent ALOGE/ALOGD functions.
Change-Id: I7e38f2d4ca74a828df4d2266b3ea34edd3c6f5bb
2014-06-19 10:59:01 -07:00
Colin Cross
f02fd9f0b0
am 5e504a4e: Merge "adb: Add USB vendor ID for Honeywell"
...
* commit '5e504a4e64824e3e7132b2e4b3f68c02f417466e':
adb: Add USB vendor ID for Honeywell
2014-06-19 15:40:59 +00:00
Colin Cross
1a9e9c203b
am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values"
...
* commit '974a4f3e00861da9aa1301efd5c349c3e2a5cf07':
Use inet_ntoa to display ipaddr and mask values
2014-06-19 00:49:10 +00:00
Elliott Hughes
030ba83c28
Merge "Updated non-ARM archs to reflect logging changes."
2014-06-19 00:18:04 +00:00
Brigid Smith
e17f267b2a
Updated non-ARM archs to reflect logging changes.
...
Change-Id: I0af865881c19ea4a57ec1aa9455bc32c08a60d75
2014-06-19 11:33:38 -07:00
Colin Cross
974a4f3e00
Merge "Use inet_ntoa to display ipaddr and mask values"
2014-06-19 00:18:04 +00:00
Bhanu Chetlapalli
9875ee97c7
Use inet_ntoa to display ipaddr and mask values
...
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Iee72a6b987e4ec1c720e925b59e9e2631ae978e5
2014-06-18 17:24:04 -07:00
Ying Wang
68d97430dd
am 4924d10a: Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed."
...
* commit '4924d10ae04574a15d94c6812153321af59a3e5b':
Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
2014-06-18 22:59:02 +00:00
Elliott Hughes
a4fb975e3d
Merge "Fix debuggerd "format '%p'" build breakage."
2014-06-18 22:47:59 +00:00
Elliott Hughes
e901c1bf8a
Fix debuggerd "format '%p'" build breakage.
...
Change-Id: I589d44485e55c23d1f1a6edfa8310a90cac2429e
2014-06-19 11:46:27 -07:00
Colin Cross
5e504a4e64
Merge "adb: Add USB vendor ID for Honeywell"
2014-06-18 22:47:59 +00:00
DanielMo
8c4c8e8988
adb: Add USB vendor ID for Honeywell
...
Change-Id: Ib92eca23a6c75ec9323bb1b0e7d7f8cd5f9ca207
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-06-19 16:02:14 +08:00
Mark Salyzyn
8d782f5170
am 3f55d2f4: Merge "logcat: test: modernize"
...
* commit '3f55d2f4e69dd155d558fc2aa38e6f9bb0900152':
logcat: test: modernize
2014-06-18 20:42:26 +00:00
Nick Kralevich
89e4fad09e
am 4e6aa6a2: Merge "adbd: unconditionally call setgroups"
...
* commit '4e6aa6a227401d8b56c9b149719b1e0de6afd6e8':
adbd: unconditionally call setgroups
2014-06-18 20:05:41 +00:00
Mark Salyzyn
deae968a2c
am 4da93e34: Merge "logd: Allow apps to clear their UID-specific data"
...
* commit '4da93e34388748879a25974ee33ff1eb6cc47cd2':
logd: Allow apps to clear their UID-specific data
2014-06-18 19:16:04 +00:00
Mark Salyzyn
6bda771640
am 9e7bef0e: Merge changes I759c65e8,I97699037
...
* commit '9e7bef0ef91e819a11ceb8b14489cb451970e62e':
logd: test: deal with spam filter turned off
logd: test: modernize
2014-06-18 19:16:03 +00:00
Elliott Hughes
bd80e0d8e6
am 0ef3fa24: Merge "Changed maps output in debuggerd."
...
* commit '0ef3fa24fb0c3c58b8440527e4de4f3f98ddaaa5':
Changed maps output in debuggerd.
2014-06-17 22:52:46 +00:00
Nick Kralevich
4e6aa6a227
Merge "adbd: unconditionally call setgroups"
2014-06-17 21:47:03 +00:00
Nick Kralevich
e5cbf4e044
adbd: unconditionally call setgroups
...
We should ensure that the appropriate supplementary groups are
set, regardless of whether we're running UID=0 or UID=shell.
Change-Id: I3a1624a574102be08176a41f9c7eb5f82af2b3e5
2014-06-18 11:24:27 -07:00
Mark Salyzyn
4da93e3438
Merge "logd: Allow apps to clear their UID-specific data"
2014-06-17 21:47:03 +00:00