Commit graph

31557 commits

Author SHA1 Message Date
Josh Gao
4182357b37 Merge "Revert "adb: check our socketpair ends in our win32 emulation."" am: c1314c8b13 am: 83b3c0817f am: cf476c9360
am: 3e5fb4a680

Change-Id: I2125437f764f714772845769927a6eaf39b82df8
2017-03-31 00:04:01 +00:00
Josh Gao
3e5fb4a680 Merge "Revert "adb: check our socketpair ends in our win32 emulation."" am: c1314c8b13 am: 83b3c0817f
am: cf476c9360

Change-Id: I9aaf0ec0c9ba7dab9825da5eb7629a54c4068aeb
2017-03-31 00:01:47 +00:00
Josh Gao
cf476c9360 Merge "Revert "adb: check our socketpair ends in our win32 emulation."" am: c1314c8b13
am: 83b3c0817f

Change-Id: I316e666330a3e9ae7ff4cf8fca43fdf803d5612c
2017-03-30 23:59:17 +00:00
Josh Gao
83b3c0817f Merge "Revert "adb: check our socketpair ends in our win32 emulation.""
am: c1314c8b13

Change-Id: I4eaca80573fc3b17ff312eae2e9e4598a0bcf55a
2017-03-30 23:56:45 +00:00
Josh Gao
c1314c8b13 Merge "Revert "adb: check our socketpair ends in our win32 emulation."" 2017-03-30 23:54:24 +00:00
Keun-young Park
5f3723fb6f send SIGTERM only once am: e41bf08f56
am: 850d6d99e4

Change-Id: I4c3e8042df0a7f4b0ebe1782365deb47a1f044ff
2017-03-30 23:38:16 +00:00
Keun-young Park
5b01385e71 add killProcessGroupOnce am: e1adb869da
am: 8cc574209c

Change-Id: I474e0e56b6dcc69a9616cf14d8c4267ddadbcded
2017-03-30 23:38:11 +00:00
Keun-young Park
520d199b68 set zero shutdown timeout for eng build am: 54df8375ba
am: 63b023bce3

Change-Id: Ia4e19dea1b99d3367507b88da3ba71f7ac5b02cd
2017-03-30 23:38:00 +00:00
Keun-young Park
850d6d99e4 send SIGTERM only once
am: e41bf08f56

Change-Id: Ie580cefaa6309d3bfe6700522ca7bf8f4ddc1a73
2017-03-30 23:32:31 +00:00
Keun-young Park
8cc574209c add killProcessGroupOnce
am: e1adb869da

Change-Id: Ie9fe9a68edc4f9acac6e93acebad8081769171a4
2017-03-30 23:32:26 +00:00
Keun-young Park
63b023bce3 set zero shutdown timeout for eng build
am: 54df8375ba

Change-Id: Ifa5c54535d5e62eeed748ea71f179bc675c64389
2017-03-30 23:32:16 +00:00
Calin Juravle
c2c4d041b4 Merge "Set libnativeloader style to clang-format-2" am: 23fc5afa2d am: d6a061baab am: 70000789c4
am: 1863c0bb24

Change-Id: I28517537782fef063ccfc0e470a53561a49a4c0f
2017-03-30 22:40:25 +00:00
Calin Juravle
b454f514b9 Merge "Set libnativebridge style to clang-format-2" am: 2c317ceaba am: cb5a3425f7 am: 8a97bdd6c3
am: 14a31dabc5

Change-Id: I0bfaf44549632ec0c033b80a12f3aac90acf5975
2017-03-30 22:40:12 +00:00
Calin Juravle
1863c0bb24 Merge "Set libnativeloader style to clang-format-2" am: 23fc5afa2d am: d6a061baab
am: 70000789c4

Change-Id: I92cde2039af1aef6cc2795028264825995b4af70
2017-03-30 22:37:55 +00:00
Calin Juravle
14a31dabc5 Merge "Set libnativebridge style to clang-format-2" am: 2c317ceaba am: cb5a3425f7
am: 8a97bdd6c3

Change-Id: I2337839ea0f812e76bfc33c10434e6baae526968
2017-03-30 22:37:43 +00:00
Calin Juravle
70000789c4 Merge "Set libnativeloader style to clang-format-2" am: 23fc5afa2d
am: d6a061baab

Change-Id: I143be51670af0e2ef32ff906b054c38295876109
2017-03-30 22:35:25 +00:00
Calin Juravle
8a97bdd6c3 Merge "Set libnativebridge style to clang-format-2" am: 2c317ceaba
am: cb5a3425f7

Change-Id: I9f6cb9fb4fcc12630c82def41f3eb5e15a32a946
2017-03-30 22:35:11 +00:00
Calin Juravle
d6a061baab Merge "Set libnativeloader style to clang-format-2"
am: 23fc5afa2d

Change-Id: I893a65248f8fee6098d4def6e72d2fbff41a77e1
2017-03-30 22:33:23 +00:00
Calin Juravle
cb5a3425f7 Merge "Set libnativebridge style to clang-format-2"
am: 2c317ceaba

Change-Id: I5d88f5f50bcacc940257207f127df5002ab18621
2017-03-30 22:33:10 +00:00
Calin Juravle
23fc5afa2d Merge "Set libnativeloader style to clang-format-2" 2017-03-30 22:28:06 +00:00
Calin Juravle
2c317ceaba Merge "Set libnativebridge style to clang-format-2" 2017-03-30 22:27:56 +00:00
Keun-young Park
e41bf08f56 send SIGTERM only once
- Processes capturing SIGTERM signal will not terminate and
  killProcessGroup will timeout after retry. This gives 200ms
  of waiting per such process. Change it to retry only once as
  SIGTERM will keep failing for such process.

bug: 36696408
Test: check time spent in SIGTERM for reboot

(cherry picked from commit 506cb020c8ab080a6765b8300c84d751557ef744)

Change-Id: If080ae3aa00f1614b25cc3f673eeb70c9713ef6e
2017-03-30 14:17:18 -07:00
Keun-young Park
e1adb869da add killProcessGroupOnce
- killProcessGroup retries if it fails while
  killProcessGroupOnce only tries once.
- useful for sending signal like SIGTERM once.

bug: 36696408
Test: will add usage to init

(cherry picked from commit a88e425e0f5502062c7f3088d53b1b0ce8ef803e)

Change-Id: Ie8eb338ee919b499948baf2a220e584b54293a89
2017-03-30 14:17:09 -07:00
Keun-young Park
54df8375ba set zero shutdown timeout for eng build
- still it will take time to kill services, < 3 secs in tested device.

bug: 36678028
Test: reboot

(cherry picked from commit 56425ed87e1ad7c63437d67c3b17ed7e2ba8d340)

Change-Id: I75b5843b08cdcdbf67c4fe500aa0dd7302dd44d7
2017-03-30 14:13:42 -07:00
Josh Gao
3726a0195b Revert "adb: check our socketpair ends in our win32 emulation."
This reverts commit 5990191c4e.

Some Windows users are seeing mismatches between the two ends.

Bug: https://code.google.com/p/android/issues/detail?id=258400
Test: mma
Change-Id: Ie3a121a2754332608ff64b3b016adcb4258d41f3
2017-03-30 13:12:37 -07:00
TreeHugger Robot
0388022a6d Merge changes from topic 'emmc_ufs'
* changes:
  storaged: skip batteryproperties listener if uid_io not available
  storaged: add support for ufs health info
  storaged: read emmc health data from sysfs
2017-03-30 19:44:57 +00:00
TreeHugger Robot
937251bc6e Merge changes from topic 'revert-revert-pipe'
* changes:
  Revert "Revert "Qemu: make the qemu_pipe_open back compatible""
  Revert "Revert "Emulator: Enhance qemu_pipe.h to handle partial rw""
  Revert "Revert "Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe""
2017-03-30 19:42:43 +00:00
Dan Shi
a90c08e865 Merge "Add test config to libcutils_test_static" am: c65f842cd1 am: ad6c88f108 am: 838b61c11f
am: 224cc80862

Change-Id: Iaf00616ae3fec0bc5a36788b714075a6cdee841d
2017-03-30 18:39:31 +00:00
Dan Shi
224cc80862 Merge "Add test config to libcutils_test_static" am: c65f842cd1 am: ad6c88f108
am: 838b61c11f

Change-Id: I9807d9ddda80ea8c57db07d01bae5d6ecfa142c1
2017-03-30 18:32:54 +00:00
Dan Shi
838b61c11f Merge "Add test config to libcutils_test_static" am: c65f842cd1
am: ad6c88f108

Change-Id: I3f6e77a45949d7685f2fc09776f2c34cd3ca879c
2017-03-30 18:31:25 +00:00
Dan Shi
ad6c88f108 Merge "Add test config to libcutils_test_static"
am: c65f842cd1

Change-Id: I98db0493d3afedfa872bc25e943adba800c007b6
2017-03-30 18:29:24 +00:00
Treehugger Robot
c65f842cd1 Merge "Add test config to libcutils_test_static" 2017-03-30 18:26:33 +00:00
Christopher Ferris
9aab8a756f Merge "Add DwarfMemory class." am: ce12417925 am: 052dd1ba53 am: 0da11818af
am: 7d347a67fe

Change-Id: I351c521e2876c59703a694e42140d38b6bcc16b5
2017-03-30 18:23:24 +00:00
Christopher Ferris
7d347a67fe Merge "Add DwarfMemory class." am: ce12417925 am: 052dd1ba53
am: 0da11818af

Change-Id: I38d633fb89c62087b2cf459f4eeead5b1246bf2e
2017-03-30 18:18:55 +00:00
Christopher Ferris
0da11818af Merge "Add DwarfMemory class." am: ce12417925
am: 052dd1ba53

Change-Id: Ib9711fb0eb80779b38799a0dc1a4c3d7f05fb049
2017-03-30 18:16:54 +00:00
Christopher Ferris
052dd1ba53 Merge "Add DwarfMemory class."
am: ce12417925

Change-Id: If3928bf14f25d792f512b3a67cdc5b05c14e7f0a
2017-03-30 18:14:53 +00:00
Christopher Ferris
ce12417925 Merge "Add DwarfMemory class." 2017-03-30 18:10:29 +00:00
Tao Bao
c69212344d Merge "fs_mgr: change the log level in fs_mgr_get_boot_config()" into oc-dev am: adcb843de7
am: 19c292baa9

Change-Id: I0c252127f6bf5b066fc16bc9565ef89d128edcb7
2017-03-30 17:25:31 +00:00
Tao Bao
19c292baa9 Merge "fs_mgr: change the log level in fs_mgr_get_boot_config()" into oc-dev
am: adcb843de7

Change-Id: I581e062d43cc5020da823792c2229a5327ddb44c
2017-03-30 17:19:21 +00:00
Tao Bao
adcb843de7 Merge "fs_mgr: change the log level in fs_mgr_get_boot_config()" into oc-dev 2017-03-30 17:15:18 +00:00
Dan Shi
d8f533aab2 Add test config to libcutils_test_static
Design doc:
Generalized Suites & the Unification of APCT & CTS Workflows Design/Roadmap
https://docs.google.com/document/d/1eabK3srlBLouMiBMrNP3xJPiRRdcoCquNxC8gBWPvx8/edit#heading=h.78vup5eivwzo

Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
Change-Id: I9faa1c929fff43635aff06b4228501e1227c4d06
2017-03-29 23:13:08 -07:00
Keun-young Park
b28221be05 Merge "send SIGTERM only once" am: 9ead7c4a74 am: ba54f32b0a am: 72d44ae00c
am: 1bcca04d6b

Change-Id: I4dcc796986e060200ba4981d31b1490aa7766b1a
2017-03-30 04:21:34 +00:00
Keun-young Park
1bcca04d6b Merge "send SIGTERM only once" am: 9ead7c4a74 am: ba54f32b0a
am: 72d44ae00c

Change-Id: I31b6064ae5625a1f6cd1b34c57085a18d870be27
2017-03-30 04:19:35 +00:00
Keun-young Park
72d44ae00c Merge "send SIGTERM only once" am: 9ead7c4a74
am: ba54f32b0a

Change-Id: Ib13d0285f00b224cffdc4b23552d0196c0c0f697
2017-03-30 04:17:35 +00:00
Keun-young Park
ba54f32b0a Merge "send SIGTERM only once"
am: 9ead7c4a74

Change-Id: I87ac8e4402207719dd6cebb05adc0a3e1c2afbfe
2017-03-30 04:15:04 +00:00
Treehugger Robot
9ead7c4a74 Merge "send SIGTERM only once" 2017-03-30 04:10:41 +00:00
Keun-young Park
8eff59d6bc Merge "add killProcessGroupOnce" am: c8a575588a am: d140cc9bf3 am: cb52d51488
am: 60ffe0541c

Change-Id: Ied96769f098fabf57aca6970b2f57a399373a9ab
2017-03-30 02:07:57 +00:00
Keun-young Park
60ffe0541c Merge "add killProcessGroupOnce" am: c8a575588a am: d140cc9bf3
am: cb52d51488

Change-Id: I54d3233c0710b0edff2c23975ce8f5dee756eccb
2017-03-30 01:58:55 +00:00
Keun-young Park
cb52d51488 Merge "add killProcessGroupOnce" am: c8a575588a
am: d140cc9bf3

Change-Id: I3eed238ea53e497d3108ea21919522c235e9830a
2017-03-30 01:56:55 +00:00
Keun-young Park
d140cc9bf3 Merge "add killProcessGroupOnce"
am: c8a575588a

Change-Id: I5382136149b2d7916fe3d891fe04fd79ade97bb2
2017-03-30 01:55:24 +00:00