Yi Kong
eb066ae098
Merge "healthd: Fix negativity check after cast to unsigned enum" am: 3dad67af05
...
am: 4734981245
Change-Id: I77ec8aae517e4bd647a7dd6c87cb53152410e7c9
2018-03-03 00:34:29 +00:00
Yi Kong
4734981245
Merge "healthd: Fix negativity check after cast to unsigned enum"
...
am: 3dad67af05
Change-Id: If35b22e1a2e56a0a424aedc8d8e36d23c1ed5ea8
2018-03-03 00:09:34 +00:00
Treehugger Robot
3dad67af05
Merge "healthd: Fix negativity check after cast to unsigned enum"
2018-03-02 19:49:18 +00:00
Yi Kong
808e57e3f3
healthd: Fix negativity check after cast to unsigned enum
...
mapSysfsString return code is checked for negativity after being casted
to unsigned enum type, which will always be false. This is obviously
unintended behaviour.
Fixes tautological-unsigned-enum-zero-compare warning.
Bug: 72331526
Test: m
Change-Id: Icec76d7a1121cb56fd9d05feb70cede69954c322
2018-03-02 18:42:03 +00:00
Adam Lesinski
fbd68ec85e
Merge "Remove empty zip warning on host builds" am: fd42c09813
...
am: c9c0460e99
Change-Id: Ie22226ad9a9c0dc5f3fbc4a841936cdecabf3cc4
2018-03-02 02:32:13 +00:00
Adam Lesinski
c9c0460e99
Merge "Remove empty zip warning on host builds"
...
am: fd42c09813
Change-Id: Ic3d788dd7da989da048bfb410ca51bea716e3d08
2018-03-02 02:21:02 +00:00
Treehugger Robot
fd42c09813
Merge "Remove empty zip warning on host builds"
2018-03-02 02:07:00 +00:00
Paul Crowley
492ff5bf09
Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery."" am: b9ee9abebe
...
am: c30557f2bf
Change-Id: If87f2af0a0babe02d45353c57d08fd7335cfc2f6
2018-03-02 01:49:18 +00:00
Paul Crowley
c30557f2bf
Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery.""
...
am: b9ee9abebe
Change-Id: I46fd5105be75661eb74ab17528e03ac420e022dc
2018-03-02 01:43:48 +00:00
Treehugger Robot
b9ee9abebe
Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery.""
2018-03-02 01:26:32 +00:00
Tom Cherry
54dd80337d
Merge "Restrict setting platform properties from vendor .prop files" am: c3892c045f
...
am: 550ebdf9fb
Change-Id: Ie9d551ff1bede431ab562f3fb127254a726e79d3
2018-03-02 01:22:40 +00:00
Tom Cherry
550ebdf9fb
Merge "Restrict setting platform properties from vendor .prop files"
...
am: c3892c045f
Change-Id: I8d5cbc8addf03785d9effdde97c170d60b7c1255
2018-03-02 01:17:07 +00:00
Tom Cherry
c3892c045f
Merge "Restrict setting platform properties from vendor .prop files"
2018-03-02 01:12:32 +00:00
Yi Kong
7a4070ca95
Merge "Remove unreachable condition" am: a281389bf4
...
am: 061759246c
Change-Id: Icbdf441bc974fe97c73343ff1d92e3f0d6fabaaa
2018-03-02 01:00:34 +00:00
Yi Kong
061759246c
Merge "Remove unreachable condition"
...
am: a281389bf4
Change-Id: I99e38d37f5fae3a71787eb6c63826c5fc57ba653
2018-03-02 00:55:28 +00:00
Treehugger Robot
a281389bf4
Merge "Remove unreachable condition"
2018-03-02 00:48:42 +00:00
Paul Crowley
e242a97db5
Revert "If enablefilecrypto or init_user0 fails, reboot into recovery."
...
This reverts commit 959b055535
.
Reason for revert: b/73968735
Bug: 73968735
Test: b/73968735#comment5
Change-Id: Ifce4c029bab7380c60e20cc2b2885beb4a097456
2018-03-01 23:24:20 +00:00
Tom Cherry
0a6357dfea
Merge "Clean up property set error handling" am: fe6cc42de4
...
am: d9b54aeb48
Change-Id: Id7bfa9025f513719a1abbac5d240cdf4759b5886
2018-03-01 23:09:53 +00:00
Tom Cherry
d9b54aeb48
Merge "Clean up property set error handling"
...
am: fe6cc42de4
Change-Id: I5f3c0dcdf8cc56374d9fc4e23283373a376c3913
2018-03-01 23:04:49 +00:00
Tom Cherry
fe6cc42de4
Merge "Clean up property set error handling"
2018-03-01 22:54:24 +00:00
Yi Kong
141cceee58
Remove unreachable condition
...
Comparison of unsigned enum expression < 0 is always false. Fixes
tautological-unsigned-enum-zero-compare warning.
Bug: 72331526
Test: m
Change-Id: I17eb218b256015f5f406fd24324a49b05a0e8866
2018-03-01 22:54:08 +00:00
George Burgess IV
ad4025b35b
Merge "Add a NOLINT for the memory leak we added" am: 10f62351eb
...
am: 4e3ae2cbfa
Change-Id: I32d7a736428f38c68ccf90947841732eaae4c224
2018-03-01 22:15:07 +00:00
George Burgess IV
4e3ae2cbfa
Merge "Add a NOLINT for the memory leak we added"
...
am: 10f62351eb
Change-Id: I67067e5611b14a6a7a818adb503a07f8a9e2dcef
2018-03-01 22:10:28 +00:00
Treehugger Robot
10f62351eb
Merge "Add a NOLINT for the memory leak we added"
2018-03-01 22:00:02 +00:00
Adam Lesinski
b354dcef98
Remove empty zip warning on host builds
...
Change-Id: Iaafe208930c316cc32f39ce2687be555b9eeb35f
2018-03-01 21:33:49 +00:00
Tom Cherry
dc375869ab
Restrict setting platform properties from vendor .prop files
...
We should only allow vendor-init-settable properties to be set from
.prop files on /vendor and /odm.
Bug: 73905119
Test: test on walleye that disallowed properties are rejected
Change-Id: I2a5d244fdc71060ddda3e3d87442e831e6b97831
2018-03-01 11:17:07 -08:00
Tom Cherry
69d47aa829
Clean up property set error handling
...
Currently we only report why a property set call has failed but drop
the context of what was trying to set the property. This change
adds information about why a property was trying to be set when it
fails.
It also unifies property_set() within init to go through the same
HandlePropertySet() function as normal processes do, removing unneeded
special cases.
Test: boot bullhead
Test: attempt to set invalid properties and see better error messages
Change-Id: I5cd3a40086fd3b226e9c8a5e3a84cb3b31399c0d
2018-03-01 11:14:02 -08:00
George Burgess IV
657db00e3d
Add a NOLINT for the memory leak we added
...
Added by I7255d45335fa009dc9e5de99dff67af52bd70e06
Bug: None
Test: Ran the analyzer. Complaint is gone.
Change-Id: Id9b8debd8b9690210f5a8e19154ee3a5095b8fbd
2018-03-01 18:59:50 +00:00
Tom Cherry
9b973fe995
Merge "Don't build host_init_verifier on Android either" am: 45ee43b1ac
...
am: 274e082328
Change-Id: I8dd577d3e889dc3412e991497cdbece4300b5860
2018-03-01 06:02:01 +00:00
Tom Cherry
274e082328
Merge "Don't build host_init_verifier on Android either"
...
am: 45ee43b1ac
Change-Id: I9e065aeecff7aac555cae8817fea231c86cd3a1b
2018-03-01 05:52:36 +00:00
Tom Cherry
45ee43b1ac
Merge "Don't build host_init_verifier on Android either"
2018-03-01 05:46:39 +00:00
Tom Cherry
547f7318c2
Don't build host_init_verifier on Android either
...
Also fixes another mac build issue...
Test: linux builds still work...
Change-Id: I549891c7e38729bd5fbe79f79b7345dabd9b4b28
2018-02-28 21:43:59 -08:00
Tom Cherry
30f64de771
Merge "Don't build host_init_verifier for darwin" am: 28d364792f
...
am: 237f1bfb68
Change-Id: I69af47b6bcfd48a23933adfd290c9a921eb88202
2018-03-01 01:43:43 +00:00
Tom Cherry
237f1bfb68
Merge "Don't build host_init_verifier for darwin"
...
am: 28d364792f
Change-Id: Iefe249657adcf9b1d1a871650b65525dac678510
2018-03-01 01:38:07 +00:00
Tom Cherry
28d364792f
Merge "Don't build host_init_verifier for darwin"
2018-03-01 01:25:32 +00:00
Tom Cherry
96ff0fed82
Don't build host_init_verifier for darwin
...
And therefore fix the mac build break.
Test: none
Change-Id: Ice28780abc62fc3e46119497d23bcbc124354159
2018-02-28 17:21:14 -08:00
Tom Cherry
3597339226
Merge "init: add host side parser for init" am: 49fd480ede
...
am: 7b649a5b50
Change-Id: If4bf32e9cda90fb1e389ed3ce26313d7aa9775d4
2018-03-01 00:20:51 +00:00
Tom Cherry
7b649a5b50
Merge "init: add host side parser for init"
...
am: 49fd480ede
Change-Id: Idf901f1b3094f5ff3f3a3886f1dc72157282ee17
2018-03-01 00:16:28 +00:00
Tom Cherry
49fd480ede
Merge "init: add host side parser for init"
2018-03-01 00:04:49 +00:00
Josh Gao
399c3591f2
Merge "adb: add a way to make the server intentionally leak." am: 1ac7150590
...
am: 9ba182e3bb
Change-Id: I2f27b341ebceccefbc055c8b98dd14526767baff
2018-02-28 23:12:25 +00:00
Josh Gao
9ba182e3bb
Merge "adb: add a way to make the server intentionally leak."
...
am: 1ac7150590
Change-Id: I4765b5726985555c5c7b325da2b779c7f1687dc0
2018-02-28 23:07:50 +00:00
Treehugger Robot
1ac7150590
Merge "adb: add a way to make the server intentionally leak."
2018-02-28 22:56:30 +00:00
Josh Gao
e2176118f4
adb: add a way to make the server intentionally leak.
...
Add a way to test LeakSanitizer with the server by adding an
environment variable that intentionally leaks.
Test: ASAN_OPTIONS=detect_leaks=1:leak_check_at_exit=1 ADB_LEAK=1 adb server nodaemon
Change-Id: I7255d45335fa009dc9e5de99dff67af52bd70e06
2018-02-28 14:16:14 -08:00
Colin Cross
ca18f082aa
Merge "Make memunreachable_binder_test suitable for VTS" am: c8a22bc1af
...
am: ab9ca8beb5
Change-Id: I2c604c33974656144df772afdb7219ed39e1529a
2018-02-28 19:24:59 +00:00
Colin Cross
ab9ca8beb5
Merge "Make memunreachable_binder_test suitable for VTS"
...
am: c8a22bc1af
Change-Id: Ia56784ec3ec783a5d0ff610104a944a3ba18e461
2018-02-28 19:19:16 +00:00
Colin Cross
c8a22bc1af
Merge "Make memunreachable_binder_test suitable for VTS"
2018-02-28 19:11:42 +00:00
Tom Cherry
de6bd50d42
init: add host side parser for init
...
Create a host side parser for init such that init rc files can be
verified for syntax correctness before being used on the device.
Bug: 36970783
Test: run the parser on init files on host
Change-Id: I7e8772e278ebaff727057308596ebacf28b6fdda
2018-02-28 10:45:45 -08:00
Luis Hector Chavez
d12cf88945
Merge "Change the remount command to be more container-friendly" am: d24c8484c8
...
am: 677288c80a
Change-Id: I96fdf4c334626649ca0e7437a0d9296758a9b062
2018-02-28 17:06:23 +00:00
Luis Hector Chavez
677288c80a
Merge "Change the remount command to be more container-friendly"
...
am: d24c8484c8
Change-Id: I878aa9f99481ba1cc2b358d163e6a396ef7c39a9
2018-02-28 17:00:15 +00:00
Treehugger Robot
d24c8484c8
Merge "Change the remount command to be more container-friendly"
2018-02-28 16:48:37 +00:00