Iliyan Malchev
8effdedd00
Merge "init: allow '.' and '@' in service names" am: d879e0c750 am: 8ef815de68 am: 96306b71a1
...
am: 7f2a54d15d
Change-Id: I77aded976737ef65baae630b1f00f7b6b0734082
2016-10-26 17:51:32 +00:00
Iliyan Malchev
7f2a54d15d
Merge "init: allow '.' and '@' in service names" am: d879e0c750 am: 8ef815de68
...
am: 96306b71a1
Change-Id: I393cc158b2652801aabe3f9369bce73c2b09f6f4
2016-10-26 17:44:31 +00:00
Iliyan Malchev
96306b71a1
Merge "init: allow '.' and '@' in service names" am: d879e0c750
...
am: 8ef815de68
Change-Id: If3fb4300b6964f1603830a7f75221e9b7aec9623
2016-10-26 17:41:00 +00:00
Iliyan Malchev
8ef815de68
Merge "init: allow '.' and '@' in service names"
...
am: d879e0c750
Change-Id: Ib6064fff33f31905c9f2a0b3dc46ac87f29edcf1
2016-10-26 17:36:36 +00:00
Treehugger Robot
d879e0c750
Merge "init: allow '.' and '@' in service names"
2016-10-26 17:29:06 +00:00
Vitalii Tomkiv
f03d4198ed
Merge "Add timeout to usb_device_control_transfer call in usbhost code."
2016-10-26 16:57:22 +00:00
Elliott Hughes
a77b1c5a1e
Merge "Make "adb bugreport"'s .zip check case-insensitive." am: da6fe65000 am: 02ee1725ae am: 76a62ca7c0
...
am: 2087274523
Change-Id: I8f667f1d8875620c4ae52704f86d5d5ecbce6db0
2016-10-26 15:53:56 +00:00
Elliott Hughes
2087274523
Merge "Make "adb bugreport"'s .zip check case-insensitive." am: da6fe65000 am: 02ee1725ae
...
am: 76a62ca7c0
Change-Id: I84daa10e37c166a348261ea50f652b2ef0e46083
2016-10-26 15:49:20 +00:00
Iliyan Malchev
f655480b48
init: allow '.' and '@' in service names
...
Services implementing HIDL HALs must be named the same as the HIDL
package, e.g. android.hardware.nfc@1.0. Allow init to accept names
containing '.' and '@'.
Also combined logic for legal property names and legal service names.
Bug: 31458381
Bug: 32109611
Test: Tested creating service nfc@1.0-service which creates property
'init.svc.nfc@1.0-service' with and without this change. This service
successfully started only with this change.
Change-Id: Ie7a4310742bc03498d774d37b3b5fafa7c6068cc
Signed-off-by: Iliyan Malchev <malchev@google.com>
2016-10-26 08:46:24 -07:00
Elliott Hughes
76a62ca7c0
Merge "Make "adb bugreport"'s .zip check case-insensitive." am: da6fe65000
...
am: 02ee1725ae
Change-Id: Iae78e3907c3cd942e8f7439f2b904d9e841e4d32
2016-10-26 15:44:51 +00:00
Elliott Hughes
02ee1725ae
Merge "Make "adb bugreport"'s .zip check case-insensitive."
...
am: da6fe65000
Change-Id: I34d95b38bec230729b3707c698b347c9a5908831
2016-10-26 15:39:50 +00:00
Treehugger Robot
da6fe65000
Merge "Make "adb bugreport"'s .zip check case-insensitive."
2016-10-26 15:34:04 +00:00
Mark Salyzyn
f3ad3d938c
Merge "logd: getTag() functional for chatty entries" am: fbe0b45544 am: 2bbb6d65d5 am: 58bca0bca5
...
am: c74afdab08
Change-Id: I8e1fabb655c3d1ad548ea2e4c0dd3774fd918bbb
2016-10-26 14:32:58 +00:00
Mark Salyzyn
c74afdab08
Merge "logd: getTag() functional for chatty entries" am: fbe0b45544 am: 2bbb6d65d5
...
am: 58bca0bca5
Change-Id: I95892140ca3b82d8ab6d0c8529ed1c469281e7ac
2016-10-26 14:26:58 +00:00
Mark Salyzyn
58bca0bca5
Merge "logd: getTag() functional for chatty entries" am: fbe0b45544
...
am: 2bbb6d65d5
Change-Id: I1a2413b4b6c41e2dc156a37316d0b634172cb4b9
2016-10-26 14:21:58 +00:00
Mark Salyzyn
2bbb6d65d5
Merge "logd: getTag() functional for chatty entries"
...
am: fbe0b45544
Change-Id: I20705e262af4ed7c36616459b1f37dadca294277
2016-10-26 14:17:28 +00:00
Treehugger Robot
fbe0b45544
Merge "logd: getTag() functional for chatty entries"
2016-10-26 14:11:27 +00:00
Elliott Hughes
7acce1b0ab
Make "adb bugreport"'s .zip check case-insensitive.
...
Bug: TODO
Test: manual
Change-Id: I0ece7d8dcb708e3755477f7df5ff03807fd227f2
2016-10-25 17:24:54 -07:00
Elliott Hughes
c9d067fe1d
Merge "Add StartsWithIgnoreCase/EndsWithIgnoreCase." am: 61131fc92f am: 35f85910ee am: d380061dc3
...
am: bcc102c5c3
Change-Id: I89763fb5c35655dc04bc1ac471f3aacd24eb246e
2016-10-26 00:07:34 +00:00
Elliott Hughes
bcc102c5c3
Merge "Add StartsWithIgnoreCase/EndsWithIgnoreCase." am: 61131fc92f am: 35f85910ee
...
am: d380061dc3
Change-Id: I89a5da5f34c421a72df33083990d94a9eb86af72
2016-10-26 00:02:21 +00:00
Elliott Hughes
d380061dc3
Merge "Add StartsWithIgnoreCase/EndsWithIgnoreCase." am: 61131fc92f
...
am: 35f85910ee
Change-Id: Ib5da172939531887c815c43c1959bc2ab85f0f16
2016-10-25 23:58:23 +00:00
Elliott Hughes
35f85910ee
Merge "Add StartsWithIgnoreCase/EndsWithIgnoreCase."
...
am: 61131fc92f
Change-Id: Icb70321e301a6f80fcd2856c4ab573235dd8028c
2016-10-25 23:54:22 +00:00
Treehugger Robot
61131fc92f
Merge "Add StartsWithIgnoreCase/EndsWithIgnoreCase."
2016-10-25 23:48:14 +00:00
Roshan Pius
d6c4c65f0a
Merge "Rename 'wifi_legacy_hal' to 'android.hardware.wifi@1.0-service'" am: 4376d21e7f am: c8356e5ca7 am: 6bbcba9f97
...
am: b3cd8c1be3
Change-Id: I4aed20129ba6fc280d8cc0e17e11a930bceafd72
2016-10-25 23:42:47 +00:00
Roshan Pius
b3cd8c1be3
Merge "Rename 'wifi_legacy_hal' to 'android.hardware.wifi@1.0-service'" am: 4376d21e7f am: c8356e5ca7
...
am: 6bbcba9f97
Change-Id: I2818f4db6080cd863273792475e451e3867a8620
2016-10-25 23:38:37 +00:00
Roshan Pius
6bbcba9f97
Merge "Rename 'wifi_legacy_hal' to 'android.hardware.wifi@1.0-service'" am: 4376d21e7f
...
am: c8356e5ca7
Change-Id: I99a6c03a4b6562c2447453c15d05d1096806dbe6
2016-10-25 23:34:38 +00:00
Roshan Pius
c8356e5ca7
Merge "Rename 'wifi_legacy_hal' to 'android.hardware.wifi@1.0-service'"
...
am: 4376d21e7f
Change-Id: I2e187e4374fba232f0641c2fb447a281e507e216
2016-10-25 23:30:07 +00:00
Roshan Pius
4376d21e7f
Merge "Rename 'wifi_legacy_hal' to 'android.hardware.wifi@1.0-service'"
2016-10-25 23:24:14 +00:00
Vitalii Tomkiv
dfd21b89f2
Add timeout to usb_device_control_transfer call in usbhost code.
...
usb_device_control_transfer used to use "0" value in control_transfer
call which resulted in unlimited timeout. In case of bad USB devices
connected it resulted in usbhost stuck state.
Bug: 31923641
Test: manual run and test with bad devices.
Change-Id: I4a2a691a6d83107f72ba506522c932085bd09624
2016-10-25 15:58:56 -07:00
Elliott Hughes
42937492c8
Add StartsWithIgnoreCase/EndsWithIgnoreCase.
...
This has come up a couple of times now.
Bug: wanted as part of http://b/32094640
Test: ran tests
Change-Id: I51b67074b7ddeedd771d7be9651ba33e05491b33
2016-10-25 14:56:04 -07:00
Mark Salyzyn
60636fa872
logd: getTag() functional for chatty entries
...
getTag() becomes invalid when entry is dropped because mMsg
disappears to save space; but the per-tag spam filter depends on it
still being valid. Conserve space in LogBufferElement by optimizing
the size of the fields, then add a new mTag field that is set in the
object constructor. Add an isBinary() method.
SideEffects: save 12 bytes/log message overhead on 64-bit.
Test: define DEBUG_CHECK_FOR_STALE_ENTRIES and look for stale entries
Bug: 32247044
Change-Id: Iaa5f416718a92c9e0e6ffd56bd5260d8b908d5c0
2016-10-25 21:48:33 +00:00
Mark Salyzyn
3bd87e66f2
Merge "log/logd.h should point to log/log.h" am: d97efe0383 am: 171a6a4277 am: a8c6a372b5
...
am: 6c4816c674
Change-Id: Id1ebfdf2e2e6a558097c345542697acfbd7b5415
2016-10-25 19:37:58 +00:00
Mark Salyzyn
6c4816c674
Merge "log/logd.h should point to log/log.h" am: d97efe0383 am: 171a6a4277
...
am: a8c6a372b5
Change-Id: If8abca3ce6df93ac4ab3be0a4b2f3011e25ffc88
2016-10-25 19:33:22 +00:00
Mark Salyzyn
a8c6a372b5
Merge "log/logd.h should point to log/log.h" am: d97efe0383
...
am: 171a6a4277
Change-Id: I90272c3a4538e35e8ae4a2dc99b215b2b60a2da0
2016-10-25 19:29:22 +00:00
Mark Salyzyn
171a6a4277
Merge "log/logd.h should point to log/log.h"
...
am: d97efe0383
Change-Id: I5fbbe7f957f303fb61d60177474f615c9f3e7c25
2016-10-25 19:24:54 +00:00
Treehugger Robot
d97efe0383
Merge "log/logd.h should point to log/log.h"
2016-10-25 19:18:50 +00:00
Mark Salyzyn
57ba9c96e3
log/logd.h should point to log/log.h
...
Test: compile
Bug: 32395896
Bug: 30465923
Change-Id: I1ee85594a0dc6b094480161dc5dbec71eaecdfb9
2016-10-25 09:21:00 -07:00
Nick Vaccaro
70e1e9aeb1
Merge "Enable CHARGER_ENABLE_SUSPEND to allow suspend" into cw-f-dev am: 085c91bedd am: b66f7272ec
...
am: 66c7c24897
Change-Id: I0267d5d49d36f5a3e68f2b2b9f7603a6c12c61c2
2016-10-25 05:42:20 +00:00
Tom Cherry
969f4395cf
resolve merge conflicts of 4897bb5 to nyc-mr2-dev-plus-aosp
...
am: 836a404525
Change-Id: I56ca4033b9359c9626a1e8d963e57036d21e2cfb
2016-10-25 05:42:05 +00:00
Nick Vaccaro
66c7c24897
Merge "Enable CHARGER_ENABLE_SUSPEND to allow suspend" into cw-f-dev am: 085c91bedd
...
am: b66f7272ec
Change-Id: I018eaf2d2470583496b2578646bdb3f2dc9d3734
2016-10-25 05:38:08 +00:00
Tom Cherry
836a404525
resolve merge conflicts of 4897bb5 to nyc-mr2-dev-plus-aosp
...
Change-Id: Iacad26a1b27d032e7abd1c7c23a8ee87d61d0aa4
2016-10-24 22:15:12 -07:00
Nick Vaccaro
b66f7272ec
Merge "Enable CHARGER_ENABLE_SUSPEND to allow suspend" into cw-f-dev
...
am: 085c91bedd
Change-Id: Ia22c806d137907548aa23b2ce5f7553af8ffa409
2016-10-25 04:25:05 +00:00
Nick Vaccaro
4897bb57e4
Enable CHARGER_ENABLE_SUSPEND to allow suspend
...
am: e3083dec0f
Change-Id: I58f35c426ccd6030664743c3f49adbc5af7102b2
2016-10-25 04:25:04 +00:00
TreeHugger Robot
085c91bedd
Merge "Enable CHARGER_ENABLE_SUSPEND to allow suspend" into cw-f-dev
2016-10-25 04:16:25 +00:00
Damien Bargiacchi
30b37fa7ef
Merge "Always show the battery percentage unless it is unknown" into cw-f-dev am: cd542213e8 am: 15ee9338c6
...
am: 9209d6bc16
Change-Id: Iae01caa1a471d79d4a2a6c5f64c7c1280c9c38df
2016-10-25 01:40:37 +00:00
Damien Bargiacchi
b60264b0bf
Always show the battery percentage unless it is unknown am: 3f0250c3cc am: 44437259dd
...
am: 2f65bf3e37
Change-Id: Ie053342c9c4a02a1d8a40dc7295ae63fbb825323
2016-10-25 01:40:22 +00:00
Damien Bargiacchi
9209d6bc16
Merge "Always show the battery percentage unless it is unknown" into cw-f-dev am: cd542213e8
...
am: 15ee9338c6
Change-Id: Ia1b460686066aae442d8f5b105b74057f88cc99f
2016-10-25 01:37:04 +00:00
Damien Bargiacchi
2f65bf3e37
Always show the battery percentage unless it is unknown am: 3f0250c3cc
...
am: 44437259dd
Change-Id: I5f18055d0d04e642ebcc9fea4b713c1dc3298cfc
2016-10-25 01:36:50 +00:00
Damien Bargiacchi
15ee9338c6
Merge "Always show the battery percentage unless it is unknown" into cw-f-dev
...
am: cd542213e8
Change-Id: I9c8acbcd54de834dd751971c71a8500de8206ec1
2016-10-25 01:33:52 +00:00
Damien Bargiacchi
44437259dd
Always show the battery percentage unless it is unknown
...
am: 3f0250c3cc
Change-Id: I6e759572904fb7f505528812266fc48ecc8afd49
2016-10-25 01:33:50 +00:00