Tom Cherry
3bacd417fb
Merge "Use PLOG and TEMP_FAILURE_RETRY for uevent socket errors" am: 02359c6d96 am: 777cbf21df
...
am: 76755f20e7
Change-Id: Id808b8d7e72eec69ce79bb3255c5653292e8fc08
2019-11-13 09:08:20 -08:00
Tom Cherry
76755f20e7
Merge "Use PLOG and TEMP_FAILURE_RETRY for uevent socket errors" am: 02359c6d96
...
am: 777cbf21df
Change-Id: Ia3e363af051c3d3feba3eb657904db4c89d9539d
2019-11-13 09:04:49 -08:00
Tom Cherry
777cbf21df
Merge "Use PLOG and TEMP_FAILURE_RETRY for uevent socket errors"
...
am: 02359c6d96
Change-Id: I6e0a517b28aa112e7305f81874baca1832c7ed8a
2019-11-13 09:00:55 -08:00
Treehugger Robot
02359c6d96
Merge "Use PLOG and TEMP_FAILURE_RETRY for uevent socket errors"
2019-11-13 16:50:46 +00:00
Elliott Hughes
885c59ec02
Merge "Ignore nullptr in native_handle_close()." am: 2ba8c4b0af am: d36bf30620
...
am: 87d56a0603
Change-Id: I6c308a5dd9329fa2fd58cbac1ee56841520545ba
2019-11-13 08:29:04 -08:00
Tom Cherry
3b5be865c0
[automerger skipped] Merge "Move init and ueventd scripts from / to /system/etc" am: 47cdf6c078 am: ee7c1efe40 -s ours
...
am: 5266d4e3ad -s ours
am skip reason: change_id I043d9a02ba588ca37ceba2c4e28ed631792b2586 with SHA1 ec26620965 is in history
Change-Id: If3f4e87b5545a6c8b641eb14a8a3cdefbecb4473
2019-11-13 08:21:58 -08:00
Elliott Hughes
87d56a0603
Merge "Ignore nullptr in native_handle_close()." am: 2ba8c4b0af
...
am: d36bf30620
Change-Id: I5fff5eb3a301a7ff0dd44f88086fa4620d368524
2019-11-13 08:21:37 -08:00
Elliott Hughes
d36bf30620
Merge "Ignore nullptr in native_handle_close()."
...
am: 2ba8c4b0af
Change-Id: Ie5ab3f785779febbfc79e45d7f2f12097d72c274
2019-11-13 08:13:52 -08:00
Tom Cherry
5266d4e3ad
[automerger skipped] Merge "Move init and ueventd scripts from / to /system/etc" am: 47cdf6c078
...
am: ee7c1efe40 -s ours
am skip reason: change_id I043d9a02ba588ca37ceba2c4e28ed631792b2586 with SHA1 ec26620965 is in history
Change-Id: I4c3d17feb9776ffa299738123383f73209adeb2e
2019-11-13 08:13:48 -08:00
Tom Cherry
ee7c1efe40
Merge "Move init and ueventd scripts from / to /system/etc"
...
am: 47cdf6c078
Change-Id: Ia46f5dcd439dec4f28c5418195edfb32a92f7ad2
2019-11-13 08:06:10 -08:00
Elliott Hughes
2ba8c4b0af
Merge "Ignore nullptr in native_handle_close()."
2019-11-13 16:04:22 +00:00
Tom Cherry
edad2bf9b6
Use PLOG and TEMP_FAILURE_RETRY for uevent socket errors
...
Use TEMP_FAILURE_RETRY() for recvmsg() to prevent failing
unnecessarily from EINTR. Use PLOG(ERROR) in ueventd to display the
actual error if reading from the uevent socket does fail.
Test: build
Change-Id: I64a22698ce6ffc7573f75b57803551c7b6940e30
2019-11-13 07:21:42 -08:00
Tom Cherry
47cdf6c078
Merge "Move init and ueventd scripts from / to /system/etc"
2019-11-13 14:36:47 +00:00
Jiyong Park
bedd2a3c5c
[automerger skipped] Merge "Rename # vndk tag to # llndk" am: 563a73e7f7 am: 2b879c262e
...
am: 92c8977769 -s ours
am skip reason: change_id Iae2acdf1ff4097a64a5c6280797c66abb1d5a5e6 with SHA1 0e957b82c8 is in history
Change-Id: I781c7f4ffb998a58be14060bc579102a15c9dfcc
2019-11-12 23:02:56 -08:00
Jiyong Park
92c8977769
Merge "Rename # vndk tag to # llndk" am: 563a73e7f7
...
am: 2b879c262e
Change-Id: Id92e92e9bb31b0cca89beb2ee61fb9957795dd31
2019-11-12 22:54:57 -08:00
Jiyong Park
2b879c262e
Merge "Rename # vndk tag to # llndk"
...
am: 563a73e7f7
Change-Id: Icd7db9d6a6991f39cf66c6b49f7bcd747891b5e5
2019-11-12 22:46:36 -08:00
Treehugger Robot
563a73e7f7
Merge "Rename # vndk tag to # llndk"
2019-11-13 06:36:36 +00:00
Jiyong Park
b2542d2942
Rename # vndk tag to # llndk
...
The APIs that are tagged with # vndk are actually for LLNDK libraries.
Although LLNDK is part of VNDK, calling those APIs 'vndk' has given
users a wrong perception that the APIs don't need to be kept stable
because that's the norm for most of the VNDK libraries that are not
LLNDK.
In order to eliminate the misunderstanding, rename the tag to 'llndk' so
that people introducing new such API will realize what they are signing
themselves up for.
Bug: 143765505
Test: m
Merged-In: Iae2acdf1ff4097a64a5c6280797c66abb1d5a5e6
(cherry picked from commit 0e957b82c8 )
Change-Id: Iae2acdf1ff4097a64a5c6280797c66abb1d5a5e6
2019-11-13 14:32:44 +09:00
Elliott Hughes
7e42484610
Ignore nullptr in native_handle_close().
...
Just like native_handle_delete().
Bug: http://b/143898343
Test: new test
Change-Id: I373067aa6c2b03548b218c7011bdbf23bd71f260
2019-11-12 20:23:55 -08:00
Robin Hsu
306d7c13d7
Merge "libsparse: fix memory leak in output_file_close()" am: 46f9698a11 am: c324e80972
...
am: ca631082ac
Change-Id: Ic9eba016f3179d9569102c647d77a81318659cca
2019-11-12 18:31:58 -08:00
Robin Hsu
ca631082ac
Merge "libsparse: fix memory leak in output_file_close()" am: 46f9698a11
...
am: c324e80972
Change-Id: I65119178b6da128e36968b0a095f3b8a80e96059
2019-11-12 18:24:35 -08:00
Robin Hsu
c324e80972
Merge "libsparse: fix memory leak in output_file_close()"
...
am: 46f9698a11
Change-Id: I2ad649a3198cd09179956e2ca4d921f1a2be02d8
2019-11-12 18:20:25 -08:00
Treehugger Robot
46f9698a11
Merge "libsparse: fix memory leak in output_file_close()"
2019-11-13 02:05:22 +00:00
TreeHugger Robot
c9dae5d574
Merge "Rename # vndk tag to # llndk"
2019-11-13 00:31:32 +00:00
Elliott Hughes
a30d67d907
Merge "unzip/zipinfo: use float percentages like the RI." am: 08c9ceaef8 am: 4a645c7451
...
am: e0d20999c3
Change-Id: I281e272fef691ef7447873b68de03518ace3380c
2019-11-12 16:16:36 -08:00
Elliott Hughes
e0d20999c3
Merge "unzip/zipinfo: use float percentages like the RI." am: 08c9ceaef8
...
am: 4a645c7451
Change-Id: I9594c3c5e2d61901b3a587cbea10da3c58d82465
2019-11-12 16:08:30 -08:00
Elliott Hughes
4a645c7451
Merge "unzip/zipinfo: use float percentages like the RI."
...
am: 08c9ceaef8
Change-Id: Ia615e884d09d76da8a4d27f46e686b5077810e83
2019-11-12 15:57:10 -08:00
Treehugger Robot
08c9ceaef8
Merge "unzip/zipinfo: use float percentages like the RI."
2019-11-12 23:27:28 +00:00
Elliott Hughes
008759711f
unzip/zipinfo: use float percentages like the RI.
...
Test: my new test runner, specifically developed for ziptool
Change-Id: I1237d02daaf2939eebc4fd5ec19ccdd0de291ad5
2019-11-12 13:53:43 -08:00
Raman Tenneti
3a584a269c
Merge "Revert "Delay initial accept() until server initialized"" am: 5fff3877a1 am: 4443254774
...
am: 2ae0ccbee2
Change-Id: If53c0bcb77606f53a602da3ecb4c8e262ee25141
2019-11-12 11:16:38 -08:00
Raman Tenneti
4c4ad6c41f
Merge "Revert "Support socket activation of adb server"" am: 6657c5d71f am: 0b8dc11215
...
am: b99a260cc1
Change-Id: Ia9e4e695d6b9809b9a21a60acda930354c48d873
2019-11-12 11:16:10 -08:00
Raman Tenneti
91038dd3b8
Merge "Revert "fix 'adb shell'"" am: 0117aabea0 am: 243d810fea
...
am: cb6e10f909
Change-Id: Ic7173d8c8af63d8791980c307746a6bcab34e556
2019-11-12 11:15:16 -08:00
Raman Tenneti
2ae0ccbee2
Merge "Revert "Delay initial accept() until server initialized"" am: 5fff3877a1
...
am: 4443254774
Change-Id: Ia976e9f7617c6ad5bceb5546bee9fd87d8ffdd84
2019-11-12 11:11:25 -08:00
Raman Tenneti
b99a260cc1
Merge "Revert "Support socket activation of adb server"" am: 6657c5d71f
...
am: 0b8dc11215
Change-Id: Ia0c1998cb12921229d20e1d47c699f7b4fecad25
2019-11-12 11:11:00 -08:00
Elliott Hughes
9a767159c0
Merge "Remove unused android_memset16()/android_memset32()."
2019-11-12 19:10:40 +00:00
Raman Tenneti
cb6e10f909
Merge "Revert "fix 'adb shell'"" am: 0117aabea0
...
am: 243d810fea
Change-Id: I26aeb80cad7a20bf8c4ed09222bcd8b0a2799d88
2019-11-12 11:10:15 -08:00
Raman Tenneti
4443254774
Merge "Revert "Delay initial accept() until server initialized""
...
am: 5fff3877a1
Change-Id: I1bce66b314ef2789908faabd00c10e4da2c2bddc
2019-11-12 11:06:59 -08:00
Raman Tenneti
0b8dc11215
Merge "Revert "Support socket activation of adb server""
...
am: 6657c5d71f
Change-Id: I11e83217bea4327ef7e5d8b3c882f9bdfac0da09
2019-11-12 11:06:34 -08:00
Raman Tenneti
243d810fea
Merge "Revert "fix 'adb shell'""
...
am: 0117aabea0
Change-Id: Ifeaae5bfd99609bf2f8f51b40874638f4a45762d
2019-11-12 11:05:37 -08:00
Raman Tenneti
5fff3877a1
Merge "Revert "Delay initial accept() until server initialized""
2019-11-12 18:58:32 +00:00
Raman Tenneti
b71b5af783
Revert "Delay initial accept() until server initialized"
...
This reverts commit 4ad4a11aa8 .
Reason for revert: BUG: 144355953
Change-Id: Icb3d87e1f697ff60fc1262798cb19be8705e3740
2019-11-12 18:57:51 +00:00
Raman Tenneti
6657c5d71f
Merge "Revert "Support socket activation of adb server""
2019-11-12 18:56:27 +00:00
Raman Tenneti
c77904e3c5
Revert "Support socket activation of adb server"
...
This reverts commit 4456b5fc15 .
Reason for revert: Device boot failure BUG: 144355953
Change-Id: I539400fa2422bd4d6e396634c629a928cd2ac398
2019-11-12 18:55:29 +00:00
Raman Tenneti
0117aabea0
Merge "Revert "fix 'adb shell'""
2019-11-12 18:54:27 +00:00
Raman Tenneti
4932ada048
Revert "fix 'adb shell'"
...
This reverts commit cc6d793310 .
Reason for revert: Device boot failure. Conflicts while reverting dancol's CL.
Change-Id: Ic6929f20a60369b6f88f3caa22258e52d700f485
2019-11-12 18:52:12 +00:00
Tom Cherry
4903a9a12d
Merge "Move init and ueventd scripts from / to /system/etc" into qt-qpr1-dev-plus-aosp
...
am: fff956004d
Change-Id: Ia181a136bdcb7aecbba36f7790ce9609396b4eec
2019-11-12 07:57:22 -08:00
Tom Cherry
fff956004d
Merge "Move init and ueventd scripts from / to /system/etc" into qt-qpr1-dev-plus-aosp
2019-11-12 15:46:21 +00:00
Maciej Żenczykowski
a0d5266b1a
Merge "fix 'adb shell'" am: 1d284004af am: edf501ac81
...
am: ab48925f5a
Change-Id: I9b0029849f9e882bf308d0ed56cbe697a2549ae8
2019-11-12 04:41:24 -08:00
Maciej Żenczykowski
ab48925f5a
Merge "fix 'adb shell'" am: 1d284004af
...
am: edf501ac81
Change-Id: Iaf751eb70fc63987169b4390d5ec9c2628b6c1b4
2019-11-12 04:36:33 -08:00
Maciej Żenczykowski
edf501ac81
Merge "fix 'adb shell'"
...
am: 1d284004af
Change-Id: Ibc4532047231bc93ff876f13c328957e3cc2cffa
2019-11-12 04:32:01 -08:00