ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
27208 commits 1 branch 0 tags 217 MiB
Commit graph

27208 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
TreeHugger Robot
cd542213e8 Merge "Always show the battery percentage unless it is unknown" into cw-f-dev 2016-10-25 01:28:06 +00:00
Nick Vaccaro
356c7890b6 Merge "healthd: allow override of wake interval timing" into cw-f-dev am: a1be7d1bb5 am: 00c6d8ca28 
am: ce6058f272

Change-Id: I05acc4b724b221bb250082d1ffd76cead71a04a5
 2016-10-25 00:16:25 +00:00
Nick Vaccaro
576be94bd1 Merge "resolve merge conflicts of 7c5aeb0 to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp 
am: 0baead15fe

Change-Id: I17dd67f1337027c2783588ee5785c8a7bd3fa7a0
 2016-10-25 00:16:02 +00:00
Nick Vaccaro
0fbacad14d resolve merge conflicts of 7c5aeb0 to nyc-mr2-dev-plus-aosp 
am: e204690ae7

Change-Id: I4e7d1be20a43044cd785796a25177b6270eb2e39
 2016-10-25 00:16:01 +00:00
Nick Vaccaro
ce6058f272 Merge "healthd: allow override of wake interval timing" into cw-f-dev am: a1be7d1bb5 
am: 00c6d8ca28

Change-Id: I7d2d315553d4cac629ac1cc064de3d63d19e256f
 2016-10-25 00:11:12 +00:00
TreeHugger Robot
0baead15fe Merge "resolve merge conflicts of 7c5aeb0 to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp 2016-10-25 00:10:00 +00:00
Elliott Hughes
dcdfd6dd7e Merge "Allow multiple tcp adb connection to same device." am: 4818194a25 am: e060cdadc8 am: 2337e51f11 
am: a4fa877840

Change-Id: Ide69733304ed0f1ca51cb36df3a2da42d7b2997a
 2016-10-24 23:48:46 +00:00
Damien Bargiacchi
3f0250c3cc Always show the battery percentage unless it is unknown 
Bug: 29547343
Change-Id: I55630be8033cd8074628a892960b5fafe0c83338
 2016-10-24 16:45:29 -07:00
Elliott Hughes
a4fa877840 Merge "Allow multiple tcp adb connection to same device." am: 4818194a25 am: e060cdadc8 
am: 2337e51f11

Change-Id: I6b450fe6704a3e0497abc1bc5edf251a8c2c025c
 2016-10-24 23:44:45 +00:00
Elliott Hughes
2337e51f11 Merge "Allow multiple tcp adb connection to same device." am: 4818194a25 
am: e060cdadc8

Change-Id: I62c8f1c466de213c25cd36d03b3b6d7c0a71b989
 2016-10-24 23:41:15 +00:00
Elliott Hughes
e060cdadc8 Merge "Allow multiple tcp adb connection to same device." 
am: 4818194a25

Change-Id: Id2b6bc99479e94cd94154ca194985f65df7e2afa
 2016-10-24 23:36:44 +00:00
Elliott Hughes
4818194a25 Merge "Allow multiple tcp adb connection to same device." 2016-10-24 23:31:14 +00:00
Mark Salyzyn
b71092906f Merge "logd: address code fragility in last watermarks" am: dd153ef247 am: 54977be62b am: b00ad4bbb9 
am: b69404f3ca

Change-Id: I069aefbfa47a80ba263e587283a3dffafea82814
 2016-10-24 23:23:30 +00:00
Mark Salyzyn
4abf62ea9e Merge "fix regression from android_lookupEventTag_len()" am: 9fa133cc28 am: 6df6448930 am: 41afee2152 
am: ee4fe59212

Change-Id: I1a57e6e6d01cb77012e536628819c69389e188a8
 2016-10-24 23:23:17 +00:00
Mark Salyzyn
b69404f3ca Merge "logd: address code fragility in last watermarks" am: dd153ef247 am: 54977be62b 
am: b00ad4bbb9

Change-Id: I6541c8ca88e1c380ea3dc9e759c6920f5e1357d9
 2016-10-24 23:19:26 +00:00
Mark Salyzyn
ee4fe59212 Merge "fix regression from android_lookupEventTag_len()" am: 9fa133cc28 am: 6df6448930 
am: 41afee2152

Change-Id: I27f7337ea47d104aff55a62258f38f54d48fce9a
 2016-10-24 23:19:13 +00:00
Mark Salyzyn
b00ad4bbb9 Merge "logd: address code fragility in last watermarks" am: dd153ef247 
am: 54977be62b

Change-Id: I52691027ea5bff4e05d1fb72450b071907b9a43f
 2016-10-24 23:15:54 +00:00
Mark Salyzyn
41afee2152 Merge "fix regression from android_lookupEventTag_len()" am: 9fa133cc28 
am: 6df6448930

Change-Id: Icc46d5f670aec79652c1de0d989ee070db9a51b9
 2016-10-24 23:15:42 +00:00
Mark Salyzyn
54977be62b Merge "logd: address code fragility in last watermarks" 
am: dd153ef247

Change-Id: I4efa93b98429528cc0445eed55cfd593ba2c24d8
 2016-10-24 23:12:55 +00:00
Mark Salyzyn
6df6448930 Merge "fix regression from android_lookupEventTag_len()" 
am: 9fa133cc28

Change-Id: I8aa5cddb87290eaf86536b567b34cb3119839911
 2016-10-24 23:12:42 +00:00
Treehugger Robot
dd153ef247 Merge "logd: address code fragility in last watermarks" 2016-10-24 23:09:15 +00:00
Treehugger Robot
9fa133cc28 Merge "fix regression from android_lookupEventTag_len()" 2016-10-24 23:08:47 +00:00
Mark Salyzyn
c87c48ba7e Merge changes I8c58d6bd,I0a19fd87 am: 291fd678e5 am: d461fd39fb am: 835ee906ab 
am: 911a034a21

Change-Id: I45cc0a8d52fa241bb23b8da4f39b086c56abee5e
 2016-10-24 23:05:00 +00:00
Mark Salyzyn
a8a8aaacfe bootstat: drop event_log_list_builder am: 343b76e449 am: d601f3ff2c am: e0bf92f3c1 
am: 0caa38b045

Change-Id: If394a18a4f733ab009b85b98c403c6611674062f
 2016-10-24 23:04:50 +00:00
Mark Salyzyn
de3ae8cfc0 liblog: logd: logcat: Split out log/logger.h into public and private. am: aeaaf81c2c am: 28fcac705b am: df8ca4c0cf 
am: 003248a984

Change-Id: I3b6a45c965c814493b7080415f4b3fc2678df3db
 2016-10-24 23:04:41 +00:00
Mark Salyzyn
911a034a21 Merge changes I8c58d6bd,I0a19fd87 am: 291fd678e5 am: d461fd39fb 
am: 835ee906ab

Change-Id: I15d3c06c943030f376776bde70fd581575110b27
 2016-10-24 23:01:25 +00:00
Mark Salyzyn
0caa38b045 bootstat: drop event_log_list_builder am: 343b76e449 am: d601f3ff2c 
am: e0bf92f3c1

Change-Id: I68479606160046177f51096bc95fb2275bf402e3
 2016-10-24 23:01:17 +00:00
Mark Salyzyn
003248a984 liblog: logd: logcat: Split out log/logger.h into public and private. am: aeaaf81c2c am: 28fcac705b 
am: df8ca4c0cf

Change-Id: Idd47b90090afa2bd3f1ef06452625cf935405567
 2016-10-24 23:01:11 +00:00
Mark Salyzyn
835ee906ab Merge changes I8c58d6bd,I0a19fd87 am: 291fd678e5 
am: d461fd39fb

Change-Id: I51cd639eaa6a4d0ec1d9db6c558a22ab4420a35c
 2016-10-24 22:56:59 +00:00
Mark Salyzyn
e0bf92f3c1 bootstat: drop event_log_list_builder am: 343b76e449 
am: d601f3ff2c

Change-Id: I6776fd71d0ae16a21aebc7d2500edab984a31c9d
 2016-10-24 22:56:51 +00:00