Commit Graph

34282 Commits

Author SHA1 Message Date
Narayan Kamath 758d3edea1 Merge "tombstoned: turn on java trace support + unit tests." am: 3aaf17fc16 am: dcb4b80694 am: c6f30913bf
am: fcef1a6b13

Change-Id: I3df79218876fe4d7633442cccb924d232e78cc7b
2017-06-08 16:10:53 +00:00
Narayan Kamath fcef1a6b13 Merge "tombstoned: turn on java trace support + unit tests." am: 3aaf17fc16 am: dcb4b80694
am: c6f30913bf

Change-Id: I2df901a03f04a3c3e9981c3a5bdd33bb610dcbba
2017-06-08 13:29:12 +00:00
Narayan Kamath c6f30913bf Merge "tombstoned: turn on java trace support + unit tests." am: 3aaf17fc16
am: dcb4b80694

Change-Id: I209fdf87135d88468bc37f102710078ffe871bdc
2017-06-08 13:26:17 +00:00
Narayan Kamath dcb4b80694 Merge "tombstoned: turn on java trace support + unit tests."
am: 3aaf17fc16

Change-Id: I1865c712e1cd96c360bebab4a6ca733255e81fe2
2017-06-08 13:23:11 +00:00
Narayan Kamath 3aaf17fc16 Merge "tombstoned: turn on java trace support + unit tests." 2017-06-08 13:18:48 +00:00
Josh Gao b7a9ae9b5e adb: libusb: switch from polling for accessibility to a sleep. am: fd79f01baf -s ours
am: 510d093302  -s ours

Change-Id: I15b2ae6a2ede07052aaabbaff31d2986e5195f73
2017-06-08 07:04:42 +00:00
Josh Gao 6dfb97d793 adb: improve race between device_connected and device_disconnected. am: f74dd42e4e -s ours
am: 29c0882ad9  -s ours

Change-Id: I7a96ab6c8bccb622fcb984a5c88ae58960b18818
2017-06-08 07:04:27 +00:00
Josh Gao 510d093302 adb: libusb: switch from polling for accessibility to a sleep.
am: fd79f01baf  -s ours

Change-Id: Ied7a0cb517d9dd88d0e2c645885672a6a83e9112
2017-06-08 06:37:23 +00:00
Josh Gao 29c0882ad9 adb: improve race between device_connected and device_disconnected.
am: f74dd42e4e  -s ours

Change-Id: I09f2d1911142750212a4b9d9ff0ba0c8c142f467
2017-06-08 06:37:13 +00:00
Josh Gao 10277e7e9e Merge changes Id51dcb18,I2517dcb9 am: 4db472b779 am: aa3c3fc3be am: 4b32a1f8b8
am: 806ca1a1b0

Change-Id: Ia93bff9a5f86d78d2c1cb18c3e3d0bb5276b1e8e
2017-06-07 20:14:54 +00:00
Josh Gao 806ca1a1b0 Merge changes Id51dcb18,I2517dcb9 am: 4db472b779 am: aa3c3fc3be
am: 4b32a1f8b8

Change-Id: I9b9a5f594dd9a20bbf6dc2fead193433deb51942
2017-06-07 20:12:53 +00:00
Josh Gao 4b32a1f8b8 Merge changes Id51dcb18,I2517dcb9 am: 4db472b779
am: aa3c3fc3be

Change-Id: I095bdeb2621fc49c568d3f7ada8e1abdf688e008
2017-06-07 20:11:22 +00:00
Josh Gao aa3c3fc3be Merge changes Id51dcb18,I2517dcb9
am: 4db472b779

Change-Id: I86c616c6840133a38f8af6b8b9e61b58435bcc32
2017-06-07 20:08:54 +00:00
Treehugger Robot 4db472b779 Merge changes Id51dcb18,I2517dcb9
* changes:
  adb: libusb: switch from polling for accessibility to a sleep.
  adb: improve race between device_connected and device_disconnected.
2017-06-07 20:01:18 +00:00
Josh Gao fd79f01baf adb: libusb: switch from polling for accessibility to a sleep.
For unclear reasons, it seems that for some people, devices are
becoming accessible, inaccessible, and then inaccessible again.
Switch to a sleep for now.

Bug: http://b/62200735
Test: manual
Merged-In: Id51dcb188c3534a57c35cbfd30a181c99115a23c
Change-Id: Id51dcb188c3534a57c35cbfd30a181c99115a23c
(cherry picked from commit 5b8b10e078)
2017-06-07 11:29:21 -07:00
Josh Gao f74dd42e4e adb: improve race between device_connected and device_disconnected.
If a device is unplugged while it's being processed, we can be inside
register_usb_transport still when we call unregister_usb_transport,
leading to bad things happening. Move the call of
register_usb_transport into the scope guarded by usb_handles_mutex.

Bug: http://b/62200735
Test: manual
Merged-In: I2517dcb9d30d9a08cebbb5f715ae3fd30c510109
Change-Id: I2517dcb9d30d9a08cebbb5f715ae3fd30c510109
(cherry picked from commit 7dd382ded9)
2017-06-07 11:29:14 -07:00
Josh Gao 5b8b10e078 adb: libusb: switch from polling for accessibility to a sleep.
For unclear reasons, it seems that for some people, devices are
becoming accessible, inaccessible, and then inaccessible again.
Switch to a sleep for now.

Bug: http://b/62200735
Test: manual
Change-Id: Id51dcb188c3534a57c35cbfd30a181c99115a23c
2017-06-07 11:08:00 -07:00
Josh Gao 7dd382ded9 adb: improve race between device_connected and device_disconnected.
If a device is unplugged while it's being processed, we can be inside
register_usb_transport still when we call unregister_usb_transport,
leading to bad things happening. Move the call of
register_usb_transport into the scope guarded by usb_handles_mutex.

Bug: http://b/62200735
Test: manual
Change-Id: I2517dcb9d30d9a08cebbb5f715ae3fd30c510109
2017-06-07 11:06:53 -07:00
Logan Chien 3ba3276eaa Add libion.so to vndk-sp am: 40624c5d1d -s ours am: 435baf5d00 -s ours
am: 3730fdde78  -s ours

Change-Id: I0ad7be4bf462de839ec728e917aa245800671c4d
2017-06-07 18:05:34 +00:00
Logan Chien c173367328 Add libion.so to vndk-sp am: 40624c5d1d -s ours am: b66870d733 -s ours
am: 4bfa3beac7  -s ours

Change-Id: Ib07f1105289049584f2559752e44793d2161ed0d
2017-06-07 18:05:14 +00:00
Logan Chien 3730fdde78 Add libion.so to vndk-sp am: 40624c5d1d -s ours
am: 435baf5d00  -s ours

Change-Id: Idf8042a77cddcb41d9090c0099ebe6de92b6cb1d
2017-06-07 18:01:39 +00:00
Logan Chien 4bfa3beac7 Add libion.so to vndk-sp am: 40624c5d1d -s ours
am: b66870d733  -s ours

Change-Id: Ie021631876747c1574dc82c56c94654462d0c474
2017-06-07 18:00:39 +00:00
Narayan Kamath ca5e908dd6 tombstoned: turn on java trace support + unit tests.
The SELinux changes that this depends on have now landed.

This change also adds a few lower level unit tests of intercept
functionality.

Test: make; debuggerd_test
Change-Id: I0be5e85e7097e26b71db269c9ed92d9b438bfb28
2017-06-07 18:57:54 +01:00
Logan Chien 435baf5d00 Add libion.so to vndk-sp
am: 40624c5d1d  -s ours

Change-Id: Ifc8472bca50a78be5f75bc4bdec1e51462dbcdf2
2017-06-07 17:57:35 +00:00
Logan Chien b66870d733 Add libion.so to vndk-sp
am: 40624c5d1d  -s ours

Change-Id: I1b7e9aee7e9ee3ccf33cacbf7b5e453211fd8520
2017-06-07 17:57:33 +00:00
Logan Chien a6012fed8c Add libion.so to vndk-sp am: 184505597f -s ours
am: b776a11188  -s ours

Change-Id: Ic1aea73312987adb4c89e8ec67a7bde751393a12
2017-06-07 17:18:26 +00:00
Logan Chien b776a11188 Add libion.so to vndk-sp
am: 184505597f  -s ours

Change-Id: I065c1122cb5897ee17fbd50f55eb5e16ac7e73bc
2017-06-07 17:06:27 +00:00
Logan Chien ef9a611bb7 Add libion.so to vndk-sp am: 5c880b948e
am: 60c9e4486b

Change-Id: If9947f17c2af1253bef9b2d8664deaba6a222e11
2017-06-07 16:04:28 +00:00
Logan Chien 60c9e4486b Add libion.so to vndk-sp
am: 5c880b948e

Change-Id: Id5a9f18ebba80f316205b11fb90be5667edd23df
2017-06-07 15:32:20 +00:00
Logan Chien 184505597f Add libion.so to vndk-sp
This commit adds libion.so to VNDK-SP so that some vendor's
gralloc.${chipset}.so can run without problems.

Bug: 62280700
Test: Boots a device from our partners
Merged-In: I2bcfe40ed9342de6d81dd310313e984a2c64964b
Change-Id: Ib745dfe52107d792296426b097e13b7c7755d88c
2017-06-07 18:31:49 +08:00
Logan Chien 40624c5d1d Add libion.so to vndk-sp
This commit adds libion.so to VNDK-SP so that some vendor's
gralloc.${chipset}.so can run without problems.

Bug: 62280700
Test: Boots a device from our partners
Merged-In: Ib745dfe52107d792296426b097e13b7c7755d88c
Merged-In: I2bcfe40ed9342de6d81dd310313e984a2c64964b
Change-Id: If30657b93157a2abea29fadcdb0004b37ad9eaf2
2017-06-07 18:13:32 +08:00
Logan Chien 5c880b948e Add libion.so to vndk-sp
This commit adds libion.so to VNDK-SP so that some vendor's
gralloc.${chipset}.so can run without problems.

Bug: 62280700
Test: Boots a device from our partners
Change-Id: I2bcfe40ed9342de6d81dd310313e984a2c64964b
2017-06-07 18:09:37 +08:00
Jiyong Park f01b52895d vndk: remove vendor/lib from the search path of the 'vndk' namespace
'vndk' namespace is the place for VNDK-SP libs. So /vendor/lib must be
removed from its search paths. It was there just because libhardware
(which is VNDK-SP) is loading HAL libs in vendor partition from there.
However this problem has been solved by modifying the libhardware so
that HAL libs are loaded from the 'sphal' namespace and not from the
current (the 'vndk') namespace.

Bug: 37731053
Test: sailfish builds and boots
Change-Id: Ia88934a975aa8811e05b5ba408e42d132f20f4e9
2017-06-07 17:37:33 +09:00
Guang Zhu fc82c971d4 add component metadata tag to CTS liblog test acses am: de29bf4884
am: c2fbcf6f67  -s ours

Change-Id: Icd55ddd16afadb9dfa2c8f40619ff0b617bd5582
2017-06-06 19:39:51 +00:00
Guang Zhu c2fbcf6f67 add component metadata tag to CTS liblog test acses
am: de29bf4884

Change-Id: I4bc7c46b9498227ccd19c558fd821d80974bd404
2017-06-06 19:28:39 +00:00
Guang Zhu 8b1f1ca92f Merge "add component metadata tag to CTS liblog test acses" 2017-06-06 19:02:46 +00:00
Josh Gao 8e2661eedc Merge changes I6c6bf61b,I3fb0b3a8 am: 3160a25010 am: 9d7880fe96 am: 14f749c2c4
am: 2d30a74181

Change-Id: I57a3916c312b8cc23c616232e84ad6c5507b5a39
2017-06-06 03:05:34 +00:00
Josh Gao 2d30a74181 Merge changes I6c6bf61b,I3fb0b3a8 am: 3160a25010 am: 9d7880fe96
am: 14f749c2c4

Change-Id: I626e726e1672da9cc1077677b0178e70dda1e923
2017-06-06 02:57:02 +00:00
Josh Gao 14f749c2c4 Merge changes I6c6bf61b,I3fb0b3a8 am: 3160a25010
am: 9d7880fe96

Change-Id: I3f339fdceaa146d5de54957ea35df38e4fc24472
2017-06-06 02:52:01 +00:00
Josh Gao 9d7880fe96 Merge changes I6c6bf61b,I3fb0b3a8
am: 3160a25010

Change-Id: Ida24fdd74569b2c57bdb0d3cdcfa486faf3cf3f2
2017-06-06 02:45:33 +00:00
Treehugger Robot 3160a25010 Merge changes I6c6bf61b,I3fb0b3a8
* changes:
  adb: libusb: don't try to delete a usb_handle twice.
  adb: don't hold queue lock while performing callbacks.
2017-06-06 02:39:40 +00:00
Guang Zhu de29bf4884 add component metadata tag to CTS liblog test acses
Bug: 36140955
Bug: 35360169
Test: new unit test to ensure that all modules have this field
Change-Id: I352145965e8cd20371ccce3ba2b25f3a166bc3e8
Merged-In: Ifb7a14817265b4624f1dc6414b547c86aafcf4ac
2017-06-05 23:21:23 +00:00
Guang Zhu 44a4ab854e add component metadata tag to CTS liblog test acses
Bug: 36140955
Bug: 35360169
Test: new unit test to ensure that all modules have this field
Change-Id: Ifb7a14817265b4624f1dc6414b547c86aafcf4ac
2017-06-05 23:17:50 +00:00
Josh Gao 60b8c26520 adb: libusb: don't try to delete a usb_handle twice.
Previously, we would attempt to delete a usb_handle in both
device_disconnected and usb_close. If the one in device_disconnected
happened to happen first, usb_close would abort when it failed to find
the handle it was supposed to own.

Bug: http://b/62020217
Test: unplugging device on darwin
Change-Id: I6c6bf61bf89a4d9a23458c00b457080d3d6cc744
2017-06-05 15:11:53 -07:00
Josh Gao 664a618c06 adb: don't hold queue lock while performing callbacks.
Fix yet another source of deadlocks.

Bug: http://b/62020217
Test: unplugged device on darwin
Change-Id: I3fb0b3a84c56aed7d0da8ddba36e2d01fdb682ee
2017-06-05 14:54:45 -07:00
Jaegeuk Kim 0331c2cf77 fs_mgr: call format_f2fs correctly with -f
This patch formats f2fs with -f option.

Change-Id: I3fc415f35d81f22cbf1eadebc619465d36205927
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-06-05 13:57:15 -07:00
Mark Salyzyn dd9cb94957 Merge "liblog: add bool to android_log_event_list" am: d105aa8496 am: 16d6ed1845 am: e19946d27c
am: 9698d08e05

Change-Id: I7fb581ccbc357022e679e741cd84dabf08c430ef
2017-06-05 17:54:17 +00:00
Mark Salyzyn 9698d08e05 Merge "liblog: add bool to android_log_event_list" am: d105aa8496 am: 16d6ed1845
am: e19946d27c

Change-Id: Ic0f19c3525896e92b88d2f9af69b760858b4c422
2017-06-05 17:51:46 +00:00
Mark Salyzyn e19946d27c Merge "liblog: add bool to android_log_event_list" am: d105aa8496
am: 16d6ed1845

Change-Id: I2ab2284780ec03716c476d09b7988d07eb18331d
2017-06-05 17:44:15 +00:00
Mark Salyzyn 16d6ed1845 Merge "liblog: add bool to android_log_event_list"
am: d105aa8496

Change-Id: I3b376d3d5c89fd16c4e5eac5afdb74981f372ee1
2017-06-05 17:39:47 +00:00