Josh Gao
567be78f4d
Merge changes Ibfa5e7e6,I706b57a9,I53d21134,I69d4d585 am: 9674bcbd23
...
am: a21afda733
2018-06-18 19:55:19 -07:00
Josh Gao
a21afda733
Merge changes Ibfa5e7e6,I706b57a9,I53d21134,I69d4d585
...
am: 9674bcbd23
2018-06-18 19:52:02 -07:00
Treehugger Robot
9674bcbd23
Merge changes Ibfa5e7e6,I706b57a9,I53d21134,I69d4d585
...
* changes:
adb: detect some spin loops and abort.
adb: add an id field to fdevent.
adb: delete unused members in fdevent.
adb: add `adb raw` to connect to an arbitrary service.
2018-06-19 02:39:28 +00:00
Josh Gao
3bbc8164b1
adb: detect some spin loops and abort.
...
Track pending fdevents, and abort if we see an fdevent ready for
read/write for 5 minutes continuously.
Also, add a service that intentionally starts spinning, to test this.
Test: manually changed timeout to a minute, `adb raw spin`
Change-Id: Ibfa5e7e654996587f745887cb04987b982d79bed
2018-06-18 17:46:34 -07:00
Yifan Hong
b530492ccd
Merge "Revert "healthd: add stem to health@2.0-service.override [DO NOT MERGE]"" into pi-dev
...
am: ee81388edb
2018-06-18 16:43:05 -07:00
TreeHugger Robot
ee81388edb
Merge "Revert "healthd: add stem to health@2.0-service.override [DO NOT MERGE]"" into pi-dev
2018-06-18 23:35:25 +00:00
Josh Gao
191891db4d
Merge "adb: add nonblocking fd Connection." am: 812ba6a469
...
am: 891a1585ec
2018-06-18 15:15:58 -07:00
Josh Gao
891a1585ec
Merge "adb: add nonblocking fd Connection."
...
am: 812ba6a469
2018-06-18 15:10:34 -07:00
Treehugger Robot
812ba6a469
Merge "adb: add nonblocking fd Connection."
2018-06-18 21:59:12 +00:00
Josh Gao
ded557fa58
adb: add an id field to fdevent.
...
Tracking fdevents by pointer is dangerous because an fdevent can be
destroyed and recreated at the same address. Add a monotonically
increasing id field to fdevent for this purpose.
Test: treehugger
Change-Id: I706b57a9e669290ef2db258f85489a5155fc1152
2018-06-18 14:55:27 -07:00
Josh Gao
e44d38d680
adb: delete unused members in fdevent.
...
Forgot to clean this up after removing fdevent_install...
Test: treehugger
Change-Id: I53d21134a4bc8bf7b16210318c6fac5075445b39
2018-06-18 14:54:40 -07:00
Josh Gao
172d0d44bc
adb: add adb raw to connect to an arbitrary service.
...
Add a command to connect to an arbitrary service, for debugging
purposes.
Test: `adb raw shell:ls`
Change-Id: I69d4d585e5ecfa7cb8c7a543a2a27df7033b26c7
2018-06-18 14:51:56 -07:00
David Anderson
b9ad909e2d
Merge "Revert "fs_mgr: Add a library for managing logical partitions."" am: b9a2243eb3
...
am: d953cdfdb2
2018-06-18 14:41:45 -07:00
David Anderson
d953cdfdb2
Merge "Revert "fs_mgr: Add a library for managing logical partitions.""
...
am: b9a2243eb3
2018-06-18 14:38:19 -07:00
David Anderson
b9a2243eb3
Merge "Revert "fs_mgr: Add a library for managing logical partitions.""
2018-06-18 21:25:21 +00:00
Yifan Hong
9a95028eac
Revert "healthd: add stem to health@2.0-service.override [DO NOT MERGE]"
...
This should have been done with actual fixes to sepolicy and rc scripts.
This reverts commit 2992767857
2018-06-18 21:23:14 +00:00
David Anderson
89a1dca721
Revert "fs_mgr: Add a library for managing logical partitions."
...
This reverts commit e238358b76
2018-06-18 21:13:24 +00:00
Yifan Hong
97ccbc0139
Merge "healthd: add stem to health@2.0-service.override [DO NOT MERGE]" into pi-dev
...
am: 95d314be38
2018-06-18 13:25:12 -07:00
Yifan Hong
95d314be38
Merge "healthd: add stem to health@2.0-service.override [DO NOT MERGE]" into pi-dev
2018-06-18 20:15:24 +00:00
Elliott Hughes
556c587ce2
Merge "logcat: tidy "logcat.h"." am: 9040b888a6
...
am: 9d943bc128
2018-06-18 12:45:55 -07:00
David Anderson
e6d4d413f9
Merge "fs_mgr: Add a library for managing logical partitions." am: 169aa989e3
...
am: 12985226aa
2018-06-18 12:44:08 -07:00
Elliott Hughes
9d943bc128
Merge "logcat: tidy "logcat.h"."
...
am: 9040b888a6
2018-06-18 12:20:02 -07:00
David Anderson
12985226aa
Merge "fs_mgr: Add a library for managing logical partitions."
...
am: 169aa989e3
2018-06-18 12:17:43 -07:00
Treehugger Robot
9040b888a6
Merge "logcat: tidy "logcat.h"."
2018-06-18 18:58:16 +00:00
Treehugger Robot
169aa989e3
Merge "fs_mgr: Add a library for managing logical partitions."
2018-06-18 18:31:30 +00:00
Elliott Hughes
66680bd8a8
logcat: tidy "logcat.h".
...
Bug: N/A
Test: builds
Change-Id: Ibe434221060b2e1fb0973d1c840d943ad3a4ee8d
2018-06-18 10:16:46 -07:00
Elliott Hughes
ce34b60ab3
Merge "Remove liblogcat." am: 28a3160c07
...
am: 78c7ac2d95
2018-06-18 10:01:00 -07:00
Elliott Hughes
78c7ac2d95
Merge "Remove liblogcat."
...
am: 28a3160c07
2018-06-18 09:56:51 -07:00
Elliott Hughes
28a3160c07
Merge "Remove liblogcat."
2018-06-18 16:51:41 +00:00
Tom Cherry
ee536c8a58
Merge "Support oem_#### users/groups for host_init_verifier" am: fe80d069a0
...
am: e33a115a39
2018-06-18 09:09:28 -07:00
Tom Cherry
e33a115a39
Merge "Support oem_#### users/groups for host_init_verifier"
...
am: fe80d069a0
2018-06-18 09:05:18 -07:00
Tom Cherry
fe80d069a0
Merge "Support oem_#### users/groups for host_init_verifier"
2018-06-18 15:50:52 +00:00
Inseob Kim
ddc022c371
Merge "Add /system/product/* paths to permitted paths" am: c733e5af3c
...
am: af818a799d
2018-06-18 00:35:57 -07:00
Inseob Kim
af818a799d
Merge "Add /system/product/* paths to permitted paths"
...
am: c733e5af3c
2018-06-18 00:31:48 -07:00
Treehugger Robot
c733e5af3c
Merge "Add /system/product/* paths to permitted paths"
2018-06-18 07:18:59 +00:00
Inseob Kim
3918936b9e
Add /system/product/* paths to permitted paths
...
As linker doesn't resolve paths in permitted paths, /system/product
variants should be added to support devices having product partition
under /system.
Bug: 110286945
Test: m -j succeeds on taimen and libraries under /system can dlopen
libraries under /system/product/apps
Change-Id: Icd102d44511702e4ec66c07a367b59c3d9700a44
2018-06-18 14:16:49 +09:00
Elliott Hughes
e54be2dc3e
resolve merge conflicts of 8c6f7ec060 to stage-aosp-master
...
am: d60dad16a3
2018-06-16 10:16:04 -07:00
Elliott Hughes
d60dad16a3
resolve merge conflicts of 8c6f7ec060 to stage-aosp-master
...
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ibd2adc272b69d9752f04bee5901fc7590aaaf93a
2018-06-16 08:37:57 -07:00
Elliott Hughes
61b580e15e
Remove liblogcat.
...
Parsing logs isn't an API, and even if you want to do that, popen(3)
already exists.
Bug: N/A
Test: ran tests
Change-Id: I53c40be49141483da0a844a7af47da0b38d29781
2018-06-15 15:32:52 -07:00
Elliott Hughes
8c6f7ec060
Merge "bootstat: remove the only caller of liblogcat."
2018-06-15 21:44:23 +00:00
Elliott Hughes
50a24eb3bc
bootstat: remove the only caller of liblogcat.
...
We need to make progress both on adding the real interface for battery
level and cleaning up logging. This stands in the way of both.
Bug: http://b/77725702
Test: builds
Change-Id: Ia457e497606c2c7965d6895baebb26eef17857c9
Merged-In: Ia457e497606c2c7965d6895baebb26eef17857c9
2018-06-15 12:36:46 -07:00
Elliott Hughes
bb98f295dd
bootstat: remove the only caller of liblogcat.
...
We need to make progress both on adding the real interface for battery
level and cleaning up logging. This stands in the way of both.
Bug: http://b/77725702
Test: builds
Change-Id: Ia457e497606c2c7965d6895baebb26eef17857c9
(cherry picked from commit dbb650dd81
2018-06-15 17:35:06 +00:00
Tom Cherry
bfcb428318
Merge "Relax host init parser to work with the build system" am: 4632f4e868
...
am: 831e67192c
2018-06-15 10:11:18 -07:00
Tom Cherry
831e67192c
Merge "Relax host init parser to work with the build system"
...
am: 4632f4e868
2018-06-15 10:07:13 -07:00
Tom Cherry
4632f4e868
Merge "Relax host init parser to work with the build system"
2018-06-15 17:03:42 +00:00
Elliott Hughes
f46e09a9fe
Merge "libsync: add __INTRODUCED_IN annotations." am: 9d9c91acdc
...
am: 832a5b0736
2018-06-15 09:23:08 -07:00
Elliott Hughes
832a5b0736
Merge "libsync: add __INTRODUCED_IN annotations."
...
am: 9d9c91acdc
2018-06-15 09:18:17 -07:00
Elliott Hughes
9d9c91acdc
Merge "libsync: add __INTRODUCED_IN annotations."
2018-06-15 16:08:51 +00:00
Josh Gao
93916bf636
Merge "debuggerd: add support for Java traces." am: 60e9dad71e
...
am: 62717cf94a
2018-06-14 17:56:11 -07:00
Josh Gao
62717cf94a
Merge "debuggerd: add support for Java traces."
...
am: 60e9dad71e
2018-06-14 17:52:32 -07:00
