be1ca3be52
Merge "Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 am: 1bab31a4df am: 3fb0e4ae70 am: 3cee49d066 am: 96eba1ea02" into oc-mr1-dev-plus-aosp
2017-10-19 19:44:17 +00:00
5e8ec19080
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 am: 1bab31a4df am: 3fb0e4ae70 am: 3cee49d066
...
am: 96eba1ea02
2017-10-19 19:43:45 +00:00
3b4189d447
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 am: 1bab31a4df am: 3fb0e4ae70 am: 3cee49d066
...
am: cc0a358906
2017-10-19 19:43:36 +00:00
96eba1ea02
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 am: 1bab31a4df am: 3fb0e4ae70
...
am: 3cee49d066
2017-10-19 19:41:03 +00:00
cc0a358906
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 am: 1bab31a4df am: 3fb0e4ae70
...
am: 3cee49d066
2017-10-19 19:41:03 +00:00
3cee49d066
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 am: 1bab31a4df
...
am: 3fb0e4ae70
2017-10-19 19:37:26 +00:00
3fb0e4ae70
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362
...
am: 1bab31a4df
2017-10-19 19:35:22 +00:00
1bab31a4df
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4
...
am: d27178e362
2017-10-19 19:32:04 +00:00
d27178e362
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6
...
am: 45ce8549c4
2017-10-19 19:28:45 +00:00
45ce8549c4
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24
...
am: 626bb148e6
2017-10-19 19:26:16 +00:00
626bb148e6
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f
...
am: b70bb65f24
2017-10-19 19:24:40 +00:00
b70bb65f24
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39
...
am: 36424c8f5f
2017-10-19 19:22:09 +00:00
36424c8f5f
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d
...
am: d86a41ea39
2017-10-19 19:20:04 +00:00
d86a41ea39
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f
...
am: 5d8784c53d
2017-10-19 19:18:03 +00:00
5d8784c53d
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours
...
am: 95584d203f
2017-10-19 19:16:10 +00:00
95584d203f
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149
...
am: fcf9c96fff
2017-10-19 19:13:59 +00:00
24a7f14a39
Merge "init: add extra std::move" am: d72d92aee2 am: 7a23e13edb
...
am: fecca8eef1
2017-10-19 02:39:45 +00:00
fecca8eef1
Merge "init: add extra std::move" am: d72d92aee2
...
am: 7a23e13edb
2017-10-19 02:29:37 +00:00
7a23e13edb
Merge "init: add extra std::move"
...
am: d72d92aee2
2017-10-19 02:27:32 +00:00
a63ccea6ab
Merge "bootstat: remove extraneous android_logcat_destroy." am: 6393c62e2e am: 39e5bb6129
...
am: dc24a5dcec
2017-10-19 02:21:11 +00:00
d72d92aee2
Merge "init: add extra std::move"
2017-10-19 02:17:20 +00:00
dc24a5dcec
Merge "bootstat: remove extraneous android_logcat_destroy." am: 6393c62e2e
...
am: 39e5bb6129
2017-10-19 02:08:40 +00:00
39e5bb6129
Merge "bootstat: remove extraneous android_logcat_destroy."
...
am: 6393c62e2e
2017-10-19 01:56:51 +00:00
3e96c4c7d0
Merge "libbacktrace is not directly available to vendors" am: 22d2136d75 am: 0d08313bb8
...
am: 23cba23928
2017-10-19 01:47:12 +00:00
6393c62e2e
Merge "bootstat: remove extraneous android_logcat_destroy."
2017-10-19 01:43:22 +00:00
23cba23928
Merge "libbacktrace is not directly available to vendors" am: 22d2136d75
...
am: 0d08313bb8
2017-10-19 01:42:39 +00:00
0d08313bb8
Merge "libbacktrace is not directly available to vendors"
...
am: 22d2136d75
2017-10-19 01:38:31 +00:00
22d2136d75
Merge "libbacktrace is not directly available to vendors"
2017-10-19 01:31:24 +00:00
4d4cc0920b
Merge "init: wait_for_prop shouldn't run in a subcontext" am: 6e52973623 am: cadc34fd9a
...
am: fe08631fe8
2017-10-19 00:19:01 +00:00
fe08631fe8
Merge "init: wait_for_prop shouldn't run in a subcontext" am: 6e52973623
...
am: cadc34fd9a
2017-10-19 00:16:25 +00:00
cadc34fd9a
Merge "init: wait_for_prop shouldn't run in a subcontext"
...
am: 6e52973623
2017-10-19 00:14:21 +00:00
6e52973623
Merge "init: wait_for_prop shouldn't run in a subcontext"
2017-10-19 00:10:18 +00:00
52315ae329
bootstat: remove extraneous android_logcat_destroy.
...
android_logcat_pclose already does that.
Bug: http://b/67960705
Test: mma
Change-Id: I03d06b10807e8a313c9654c2e1db36bfb59e3f99
2017-10-18 16:57:33 -07:00
595deb82d6
Merge "Use target.linux for all linux kernel based targets" am: ab62265fa1 am: f973417005
...
am: abb3521abe
2017-10-18 22:59:19 +00:00
d0998841fa
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours am: 78a6b7e28c -s ours am: 3560e92125 -s ours am: 173087ab08 -s ours am: e994c06f58 -s ours
...
am: 38ec7354ad
2017-10-18 22:58:35 +00:00
abb3521abe
Merge "Use target.linux for all linux kernel based targets" am: ab62265fa1
...
am: f973417005
2017-10-18 22:56:19 +00:00
f973417005
Merge "Use target.linux for all linux kernel based targets"
...
am: ab62265fa1
2017-10-18 22:50:48 +00:00
ab62265fa1
Merge "Use target.linux for all linux kernel based targets"
2017-10-18 22:46:05 +00:00
1ba5d4ceed
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours am: 78a6b7e28c -s ours am: 3560e92125 -s ours am: 173087ab08 -s ours am: e994c06f58 -s ours
...
am: b0f25534b1
2017-10-18 22:29:15 +00:00
38ec7354ad
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours am: 78a6b7e28c -s ours am: 3560e92125 -s ours am: 173087ab08 -s ours
...
am: e994c06f58
2017-10-18 21:54:34 +00:00
b0f25534b1
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours am: 78a6b7e28c -s ours am: 3560e92125 -s ours am: 173087ab08 -s ours
...
am: e994c06f58
2017-10-18 21:54:03 +00:00
5d7b55bc69
init: add extra std::move
...
This is meant to be copy-and-move, but I forgot the move.
Test: build
Change-Id: I755ad0d99624dc0ae419ad9ed3ae6d0e017b27c5
2017-10-18 14:52:33 -07:00
fa3e52c64a
init: wait_for_prop shouldn't run in a subcontext
...
wait_for_prop sets a flag that prevents the action queue from
continuing while otherwise allowing init's main loop to continue
executing. This cannot be done from a subcontext, so it's moved to
normal init.
All property functions need work in any case, particularly once
property_service is moved out of init.
Bug: 62875318
Test: boot sailfish and see that the previous failure related to this
is fixed
Change-Id: Ib9e0d0bdbd0ff22ab0e5c3fe6db620700af266c6
2017-10-18 14:42:27 -07:00
e994c06f58
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours am: 78a6b7e28c -s ours am: 3560e92125 -s ours
...
am: 173087ab08
2017-10-18 21:34:11 +00:00
173087ab08
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours am: 78a6b7e28c -s ours
...
am: 3560e92125
2017-10-18 21:03:51 +00:00
3560e92125
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours
...
am: 78a6b7e28c
2017-10-18 20:41:31 +00:00
78a6b7e28c
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours
...
am: 8ecef89ed0
2017-10-18 20:27:38 +00:00
8ecef89ed0
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours
...
am: cee1faef67
2017-10-18 20:08:00 +00:00
cee1faef67
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours
...
am: 3c374a2ba7
2017-10-18 19:41:22 +00:00
3c374a2ba7
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours
...
am: 069ec60f20
2017-10-18 19:28:58 +00:00
Android Build Merger (Role)