Narayan Kamath
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
Change-Id: I4ada390a6e1c11f5ee88949864bd4b05942ab7b2
2017-10-19 19:43:45 +00:00
Narayan Kamath
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
Change-Id: I276c61e5cc5bb596e2e061c859b7d89c356f7d68
2017-10-19 19:41:03 +00:00
Narayan Kamath
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
Change-Id: Id60bdf2f11342bde648f79bad64ef434f3c9460f
2017-10-19 19:37:26 +00:00
Narayan Kamath
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
Change-Id: Iebb2829c8c285953a056ac2ecef682ae9485b643
2017-10-19 19:35:22 +00:00
Narayan Kamath
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
Change-Id: I44f0e220da67fc29369ba1a01a89dd10627d5f85
2017-10-19 19:32:04 +00:00
Narayan Kamath
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
Change-Id: I5b6f9a34fe64bbeab02fca9f37d5ddca138ce89a
2017-10-19 19:28:45 +00:00
Narayan Kamath
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
Change-Id: Idb4181f57f78ab4afbf8df3735897347d7effe5d
2017-10-19 19:26:16 +00:00
Narayan Kamath
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
Change-Id: Ia5d7c234efa48102c42a6f4da03e49d8cf84c54e
2017-10-19 19:24:40 +00:00
Narayan Kamath
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
Change-Id: I61e54971c10af968bdd2abe2dceeb337289ab110
2017-10-19 19:22:09 +00:00
Narayan Kamath
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
Change-Id: I4bb1b5a5baa9d39f904dd56c0a36cf32cf7b8018
2017-10-19 19:20:04 +00:00
Narayan Kamath
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
Change-Id: Iaa1e3501b3acf207d4cf5afe01dc4f530df0cd42
2017-10-19 19:18:03 +00:00
Narayan Kamath
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
Change-Id: Ie6fb905368cd34f007bae9cf5503b4b8854c04c1
2017-10-19 19:16:10 +00:00
Narayan Kamath
95584d203f
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149
...
am: fcf9c96fff
-s ours
Change-Id: I742295f582bfc96d9981638fe0a21797af714b92
2017-10-19 19:13:59 +00:00
Tom Cherry
24a7f14a39
Merge "init: add extra std::move" am: d72d92aee2
am: 7a23e13edb
...
am: fecca8eef1
Change-Id: Ifa816d0bb2b6e5e784aed66972f30316560ace55
2017-10-19 02:39:45 +00:00
Tom Cherry
fecca8eef1
Merge "init: add extra std::move" am: d72d92aee2
...
am: 7a23e13edb
Change-Id: Ibae71b9ba5dbb5e5cfccd770bd16d16bfe215ab0
2017-10-19 02:29:37 +00:00
Tom Cherry
7a23e13edb
Merge "init: add extra std::move"
...
am: d72d92aee2
Change-Id: I928e6f60bd8ffb764ea5f25a81091242efd1f61d
2017-10-19 02:27:32 +00:00
Josh Gao
a63ccea6ab
Merge "bootstat: remove extraneous android_logcat_destroy." am: 6393c62e2e
am: 39e5bb6129
...
am: dc24a5dcec
Change-Id: I50d3c3bf5c80c373238ec64f3ca9bc026d285378
2017-10-19 02:21:11 +00:00
Treehugger Robot
d72d92aee2
Merge "init: add extra std::move"
2017-10-19 02:17:20 +00:00
Josh Gao
dc24a5dcec
Merge "bootstat: remove extraneous android_logcat_destroy." am: 6393c62e2e
...
am: 39e5bb6129
Change-Id: I7221a6803499bd74c02093049b51c1fe7c220aad
2017-10-19 02:08:40 +00:00
Josh Gao
39e5bb6129
Merge "bootstat: remove extraneous android_logcat_destroy."
...
am: 6393c62e2e
Change-Id: If31be158f08cc8dcd22b0010ac1a306dc0dcc0ff
2017-10-19 01:56:51 +00:00
Jiyong Park
3e96c4c7d0
Merge "libbacktrace is not directly available to vendors" am: 22d2136d75
am: 0d08313bb8
...
am: 23cba23928
Change-Id: Idefbb4830d1488713c203a087014705cd704e74e
2017-10-19 01:47:12 +00:00
Treehugger Robot
6393c62e2e
Merge "bootstat: remove extraneous android_logcat_destroy."
2017-10-19 01:43:22 +00:00
Jiyong Park
23cba23928
Merge "libbacktrace is not directly available to vendors" am: 22d2136d75
...
am: 0d08313bb8
Change-Id: I9008cc5ad7256c800445bc8383415955532733e3
2017-10-19 01:42:39 +00:00
Jiyong Park
0d08313bb8
Merge "libbacktrace is not directly available to vendors"
...
am: 22d2136d75
Change-Id: I18e4c8b414bba731cfe6edaa332de180ff3a9f0b
2017-10-19 01:38:31 +00:00
Treehugger Robot
22d2136d75
Merge "libbacktrace is not directly available to vendors"
2017-10-19 01:31:24 +00:00
Tom Cherry
4d4cc0920b
Merge "init: wait_for_prop shouldn't run in a subcontext" am: 6e52973623
am: cadc34fd9a
...
am: fe08631fe8
Change-Id: I4fb910117150fecf4f61670be8d7ea1def235c61
2017-10-19 00:19:01 +00:00
Tom Cherry
fe08631fe8
Merge "init: wait_for_prop shouldn't run in a subcontext" am: 6e52973623
...
am: cadc34fd9a
Change-Id: I8e49ea0cec37f6abe8e5e31fb1adb83d696d969b
2017-10-19 00:16:25 +00:00
Tom Cherry
cadc34fd9a
Merge "init: wait_for_prop shouldn't run in a subcontext"
...
am: 6e52973623
Change-Id: I160bedcb91668ccf2b663c36835871d21be2db8b
2017-10-19 00:14:21 +00:00
Treehugger Robot
6e52973623
Merge "init: wait_for_prop shouldn't run in a subcontext"
2017-10-19 00:10:18 +00:00
Josh Gao
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
Dan Willemsen
595deb82d6
Merge "Use target.linux for all linux kernel based targets" am: ab62265fa1
am: f973417005
...
am: abb3521abe
Change-Id: I0bd597eb6817aec682d0792a8a5afcfcb7e19cda
2017-10-18 22:59:19 +00:00
Adam Vartanian
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
-s ours
Change-Id: I78cc2083273d66015aafefa988a6caee040c8101
2017-10-18 22:58:35 +00:00
Dan Willemsen
abb3521abe
Merge "Use target.linux for all linux kernel based targets" am: ab62265fa1
...
am: f973417005
Change-Id: I6bba9b0849075fe0703032d2c8f258b5ea86547f
2017-10-18 22:56:19 +00:00
Dan Willemsen
f973417005
Merge "Use target.linux for all linux kernel based targets"
...
am: ab62265fa1
Change-Id: I11e4bd0dae56c350a9839f95b1e85bf30490701d
2017-10-18 22:50:48 +00:00
Treehugger Robot
ab62265fa1
Merge "Use target.linux for all linux kernel based targets"
2017-10-18 22:46:05 +00:00
Adam Vartanian
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
-s ours
Change-Id: I597f2f6a4612dea2a7730510dcc0e5893139eb6c
2017-10-18 22:29:15 +00:00
Adam Vartanian
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
-s ours
Change-Id: I0c2f32aa16674d507f7d0a3e1c5be6e6f3e70e4c
2017-10-18 21:54:34 +00:00
Adam Vartanian
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
-s ours
Change-Id: I0e588479e79aa0891b242491f59c0e242ca8b77b
2017-10-18 21:54:03 +00:00
Tom Cherry
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
Tom Cherry
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
Adam Vartanian
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
-s ours
Change-Id: Ic3204d08df1ec43c937734adb24bf0a28f5f03e9
2017-10-18 21:34:11 +00:00
Adam Vartanian
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
-s ours
Change-Id: I88512d980696ecd2997f515959d1fd772d98b7fd
2017-10-18 21:03:51 +00:00
Adam Vartanian
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
-s ours
Change-Id: Ibf9e0a5b62304069c3d88742e1215b9783435391
2017-10-18 20:41:31 +00:00
Adam Vartanian
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
-s ours
Change-Id: I6c41a1c752c8ab8437e39fb4b8b269731551a397
2017-10-18 20:27:38 +00:00
Adam Vartanian
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
-s ours
Change-Id: I98ed8072c558f9ebbd402972ee4c22d246f094b9
2017-10-18 20:08:00 +00:00
Adam Vartanian
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
-s ours
Change-Id: Idb3aea9f746535f39b6abe64339c30697473d488
2017-10-18 19:41:22 +00:00
Adam Vartanian
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
-s ours
Change-Id: Ie233d2faf274e1437317fb219d3b710a0e42b8e7
2017-10-18 19:28:58 +00:00
Adam Vartanian
069ec60f20
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
Change-Id: I2bece4ef56298aadb757fbdfdb97f7e52554cdba
2017-10-18 19:23:25 +00:00
Christopher Ferris
df470cd7c5
Merge "Fix setting of map_offset in frame data." am: 8158d708c3
am: 57638bf967
...
am: edf2d46e1c
Change-Id: I93c2fa1384255cbb311f0c246d37cd16cae84d7a
2017-10-18 19:15:30 +00:00
Adam Vartanian
fc4b272afe
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31
am: 3065de2c86
-s ours am: c282fe5c2c
-s ours
...
am: 47dfd5afee
-s ours
Change-Id: I07a4521a0c2b99e71b41b26294be5b9cf1c8b817
2017-10-18 19:00:44 +00:00