Elliott Hughes
19340be9fe
Merge "Rely on the platform -std default." am: 955648a915 am: 4594f50635
...
am: f1dffe0501
Change-Id: Ibbffb45d50ad038d55a4d435a250b59b64547227
2016-10-14 02:56:09 +00:00
Elliott Hughes
7948a33f2c
resolve merge conflicts of a4398c1 to stage-aosp-master am: 195669febc
...
am: b2ab1c43cb
Change-Id: I412943235ad6cd908aca04c56aa19a3d2bbb5413
2016-10-14 02:55:55 +00:00
Elliott Hughes
f1dffe0501
Merge "Rely on the platform -std default." am: 955648a915
...
am: 4594f50635
Change-Id: I459e76bcada6d849eccca73a470a910e335482bf
2016-10-14 02:47:44 +00:00
Elliott Hughes
b2ab1c43cb
resolve merge conflicts of a4398c1 to stage-aosp-master
...
am: 195669febc
Change-Id: I112dd568460f41829fd9c01d41234bc409f5cbcf
2016-10-14 02:47:32 +00:00
Elliott Hughes
4594f50635
Merge "Rely on the platform -std default."
...
am: 955648a915
Change-Id: Ic4e9a7fbc7d13cc18ebb84801bf2f2f9a1d04470
2016-10-14 02:45:03 +00:00
Treehugger Robot
955648a915
Merge "Rely on the platform -std default."
2016-10-14 02:28:38 +00:00
Elliott Hughes
195669febc
resolve merge conflicts of a4398c1 to stage-aosp-master
...
Change-Id: I550d5716bd5879f779d11509366090bf508731e4
2016-10-13 19:04:07 -07:00
Tao Wu
4b9774fe97
Merge "Fallback to IPv6 when IPv4 is not available in adb" am: c32d7fd66f am: 5b7c6772b0
...
am: 27c6c4cf04
Change-Id: I2ceb40b4589dfc2721197065ae5a85e9dc83b907
2016-10-14 01:51:54 +00:00
Elliott Hughes
a4398c1abe
Merge "Move off std::sto* function which abort on failure."
2016-10-14 01:51:10 +00:00
Tao Wu
27c6c4cf04
Merge "Fallback to IPv6 when IPv4 is not available in adb" am: c32d7fd66f
...
am: 5b7c6772b0
Change-Id: I63e945622d47ab1cbcbdd82d00cfdf3d51c95564
2016-10-14 01:46:26 +00:00
Tao Wu
5b7c6772b0
Merge "Fallback to IPv6 when IPv4 is not available in adb"
...
am: c32d7fd66f
Change-Id: I21efa80874bfffb88cc63098e0a402a3e8d1c122
2016-10-14 01:43:55 +00:00
Treehugger Robot
c32d7fd66f
Merge "Fallback to IPv6 when IPv4 is not available in adb"
2016-10-14 01:35:43 +00:00
Elliott Hughes
da46b392f1
Move off std::sto* function which abort on failure.
...
Bug: http://b/31403370
Test: builds, boots, libbase tests pass
Change-Id: I89cd7ca3d8f1c8a1bad0ddf3043439449d19a293
2016-10-13 15:34:05 -07:00
Chia-I Wu
7e671b343f
Merge "Add native_handle_init" am: d790aae4bc am: 28423b86fe
...
am: bf72cf21dc
Change-Id: I5d4cc013421350dd30fa13d168112d30ad93e7cd
2016-10-13 22:32:57 +00:00
Chia-I Wu
bf72cf21dc
Merge "Add native_handle_init" am: d790aae4bc
...
am: 28423b86fe
Change-Id: Ied7a062c6ce40864ea181819f5da21e64cae04de
2016-10-13 22:26:11 +00:00
Chia-I Wu
28423b86fe
Merge "Add native_handle_init"
...
am: d790aae4bc
Change-Id: I10cedea42c2c1ce0aedf53b57db56ce182e5961f
2016-10-13 22:24:12 +00:00
Chia-I Wu
d790aae4bc
Merge "Add native_handle_init"
2016-10-13 22:18:11 +00:00
Christopher Ferris
afff774b42
Merge "Use process_vm_readv to read memory." am: bf0cf4e22d am: 8d7440e13c
...
am: 920011b64b
Change-Id: I995b62e3ddaeb95cc78a59ef34dd95398a620756
2016-10-13 17:40:24 +00:00
Christopher Ferris
920011b64b
Merge "Use process_vm_readv to read memory." am: bf0cf4e22d
...
am: 8d7440e13c
Change-Id: I6eacf5c70458dbdebf2a427d24085c21678cf3ed
2016-10-13 17:30:28 +00:00
Christopher Ferris
8d7440e13c
Merge "Use process_vm_readv to read memory."
...
am: bf0cf4e22d
Change-Id: I26ab63fa29f42d9f2402b360aeba6ef25987b7a5
2016-10-13 17:22:15 +00:00
Treehugger Robot
bf0cf4e22d
Merge "Use process_vm_readv to read memory."
2016-10-13 17:14:31 +00:00
Tao Wu
7b700763f5
Fallback to IPv6 when IPv4 is not available in adb
...
Test: manual - make sure it works in both IPv4/IPv6 env.
BUG: 31537253
Change-Id: Ica492bff34a8c0441516a213d0e8b78fcdfd3282
Signed-off-by: Tao Wu <lepton@google.com>
2016-10-13 08:54:43 -07:00
Elliott Hughes
fc485e4488
Merge "Start retiring socket_loopback_client." am: 58f7f61266 am: cd0e8cfd33
...
am: aa509a3e9d
Change-Id: Iea3a25f193b9249ba93d49514b2a409d693121e1
2016-10-13 15:00:24 +00:00
Elliott Hughes
aa509a3e9d
Merge "Start retiring socket_loopback_client." am: 58f7f61266
...
am: cd0e8cfd33
Change-Id: Ibd76fcb2aa9abb35a11f3b1e3f771a168f6d96de
2016-10-13 14:50:50 +00:00
Elliott Hughes
cd0e8cfd33
Merge "Start retiring socket_loopback_client."
...
am: 58f7f61266
Change-Id: I2b3d6ae5e90fb99163eb639e185b93cd55ff724a
2016-10-13 14:43:05 +00:00
Elliott Hughes
58f7f61266
Merge "Start retiring socket_loopback_client."
2016-10-13 14:38:48 +00:00
Chia-I Wu
b843791b61
Add native_handle_init
...
HIDL requires file descriptors to be wrapped in native_handle_t. We want
a low overhead way to do that when the number of file descriptors is known
at compile time. Instead of
// wrap an fd in native_handle_t
native_handle_t* fd_handle = native_handle_create(1, 0);
if (!fd_handle) {
// clean up and return error
}
fd_handle->data[0] = fd;
hidl_cb(..., fd_handle);
native_handle_delete(fd_handle);
this change adds native_handle_init to allow for
// wrap an fd in native_handle_t
NATIVE_HANDLE_DECLARE_STORAGE(fd_storage, 1, 0);
native_handle_t* fd_handle = native_handle_init(fd_storage, 1, 0);
fd_handle->data[0] = fd;
hidl_cb(..., fd_handle);
Test: make libcutils
Bug: 32021609
Change-Id: If1fd07482243d37492fdea57c602a1b13c8953cc
2016-10-12 18:04:41 -07:00
Lingfeng Yang
bdb2107ef3
Fix adb flakiness on reboot am: eec5e52ea2
...
am: e476e9ce34
Change-Id: I0ead49dfe5086520955724742e69c718eff07081
2016-10-12 23:45:10 +00:00
Lingfeng Yang
e476e9ce34
Fix adb flakiness on reboot
...
am: eec5e52ea2
Change-Id: I3496785fa4aecbab424d9f9c516415b3a3daecb2
2016-10-12 23:38:38 +00:00
Lingfeng Yang
eec5e52ea2
Fix adb flakiness on reboot
...
bug: 31950237
There are two lists of active ADB transports (devices),
and with the emulator, they can go out of sync.
This CL more conservatively checks if there are no
transports in either list before commiting to
register a new transport for the emulator.
Change-Id: Id1201dc59c70825881dad80925c2e5bcc13dbd5e
(cherry picked from commit edaedfd5da )
2016-10-12 22:27:45 +00:00
Mark Salyzyn
70b9e8ece6
Merge "logcat: test: report system(command) details" am: 5980fe4aff am: 811696b1ce
...
am: 944194bf41
Change-Id: I223e42ae85280831d4665a8ab286c5fdc258ff41
2016-10-12 21:57:03 +00:00
Mark Salyzyn
944194bf41
Merge "logcat: test: report system(command) details" am: 5980fe4aff
...
am: 811696b1ce
Change-Id: Ifefc8d003e67c68ab06143479041814f2ce1cff3
2016-10-12 21:51:53 +00:00
Mark Salyzyn
811696b1ce
Merge "logcat: test: report system(command) details"
...
am: 5980fe4aff
Change-Id: I63c8b1d3f21b280023c4a8536c49cfa588f522f9
2016-10-12 21:42:30 +00:00
Treehugger Robot
5980fe4aff
Merge "logcat: test: report system(command) details"
2016-10-12 21:28:49 +00:00
Christopher Ferris
279843e139
Use process_vm_readv to read memory.
...
Modify BacktracePtrace::Read to use the process_vm_readv syscall
instead of doing multiple ptrace calls.
Test: Ran the backtrace unit tests on host and on x86_64 emulator.
Change-Id: I24c2787f6713d8eb44312f3aa751d1f6d9d34719
2016-10-12 12:43:55 -07:00
Mark Salyzyn
56cddcd72e
logcat: test: report system(command) details
...
Provide more details regarding test failures
Test: manual, forced a failure, reports actual command issued
Bug: 30566487
Change-Id: I2431dbd335685b5eaef54ba6bd688b8588018aa9
2016-10-12 12:10:08 -07:00
Tim Murray
20350c8418
libsuspend: move to exponential backoff am: fb896944b6
...
am: cf11830695
Change-Id: Ic3289a6cf433ee1c0c9b468ea8380493663ed84f
2016-10-12 18:20:51 +00:00
Tim Murray
cf11830695
libsuspend: move to exponential backoff
...
am: fb896944b6
Change-Id: Ib94c5340ff89a6e2f3823a2eaa2be445e097cfa0
2016-10-12 18:13:18 +00:00
Lingfeng Yang
7bdbbfb0ef
Merge "Fix adb flakiness on reboot" am: f7a1c476ff am: d0dead710b
...
am: e93241e377
Change-Id: Icd024ed6896a1989f67beb512a399cd0979b2cf1
2016-10-12 00:49:27 +00:00
Lingfeng Yang
e93241e377
Merge "Fix adb flakiness on reboot" am: f7a1c476ff
...
am: d0dead710b
Change-Id: I7b966be541d89b2f13a9c39218627884e001cc21
2016-10-12 00:44:48 +00:00
Lingfeng Yang
d0dead710b
Merge "Fix adb flakiness on reboot"
...
am: f7a1c476ff
Change-Id: If74046384b04c8bae587c3194c85e1a1865e3cbb
2016-10-12 00:36:30 +00:00
Treehugger Robot
f7a1c476ff
Merge "Fix adb flakiness on reboot"
2016-10-12 00:25:11 +00:00
Lingfeng Yang
1197952e71
Fix adb flakiness on reboot
...
bug: 31950237
There are two lists of active ADB transports (devices),
and with the emulator, they can go out of sync.
This CL more conservatively checks if there are no
transports in either list before commiting to
register a new transport for the emulator.
(cherry picked from commit edaedfd5da )
Change-Id: Id1201dc59c70825881dad80925c2e5bcc13dbd5e
2016-10-11 23:19:51 +00:00
Tim Murray
fb896944b6
libsuspend: move to exponential backoff
...
If for some reason the system can't suspend (usually a driver bug),
libsuspend will currently attempt to retry suspend after 100ms. Because
entering suspend takes a significant amount of CPU time, this can be
extremely expensive and be a major contributor to rapid battery
drain. Move autosuspend to use exponential backoff if the previous
suspend attempt failed.
bug 32092914
Change-Id: I3e9e944f290de5f1853a02e3f61721ba9159df46
2016-10-11 14:51:34 -07:00
Elliott Hughes
139b372fab
Start retiring socket_loopback_client.
...
Bug: http://b/31537253
Test: can still talk to adb
Change-Id: Icfd7f00d35cf963befc139e81904790b4b8b67c0
2016-10-11 13:45:03 -07:00
Josh Gao
f369babcb8
Merge "Remove useless arguments from is_adb_interface." am: bd6c6eb0e4 am: db50d1d6ef
...
am: 0a629b4bdd
Change-Id: I54e47bf9d8e056255335e809b9733e2597b3e532
2016-10-11 17:51:40 +00:00
Josh Gao
0a629b4bdd
Merge "Remove useless arguments from is_adb_interface." am: bd6c6eb0e4
...
am: db50d1d6ef
Change-Id: I4a21f8296643bbe185ac79df8888eec07c88ca78
2016-10-11 17:42:47 +00:00
Josh Gao
db50d1d6ef
Merge "Remove useless arguments from is_adb_interface."
...
am: bd6c6eb0e4
Change-Id: I1390870da63506df411dbd94f2b19d147d90009c
2016-10-11 17:36:09 +00:00
Glenn Kasten
7f0c037fa9
Merge "Traverse /etc/init in a well-defined order" into nyc-mr1-dev am: 5639d9ad6e
...
am: 524d444f66
Change-Id: Icebc7d92aaa4e8b03952ad375a79cf59fd258bc1
2016-10-11 17:27:02 +00:00
Glenn Kasten
51d4f6e576
Traverse /etc/init in a well-defined order am: 89579f241c
...
am: ac087d798b -s ours
Change-Id: I79631090c715153bf66a9f65833d36a7a611b758
2016-10-11 17:26:49 +00:00