Nick Kralevich
53e56b9473
Merge "init: harden socket creation against symlinks" into nyc-dev
2016-02-25 06:47:11 +00:00
James Hawkins
1f1b327923
Merge "bootstat: Record the time since factory reset on init." into nyc-dev
2016-02-25 00:49:07 +00:00
Nick Kralevich
ab5629c197
init: harden socket creation against symlinks
...
Instead of using chown, use the symlink safe lchown.
Instead of using chmod, use the symlink safe fchmodat
with AT_SYMLINK_NOFOLLOW.
Fix a bug where the SELinux filesystem creation context may
not be restored, and some memory not freed, if bind() fails.
Check the return values from the chown/chmod calls and unlink
the files if it ever fails.
Bug: 27337831
Change-Id: I3343786f5a4eefda7bbb8317f2eca16bd21003c0
2016-02-24 15:50:52 -08:00
Dimitry Ivanov
426799d770
Add PreloadPublicNativeLibraries function
...
Shift responsibility of preloading native libraries to the user
of the library. This lets applications that do not use jni but
depend on libnative_loader.so to avoid unnecessary preloads of
public libraries which could be expensive.
Bug: http://b/27245894
Change-Id: I12a8100de5da639c068769bca21ecebff2b2d538
2016-02-24 23:30:27 +00:00
Josh Gao
b236ff7156
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours am: 75708e52d3
am: 512b191d80
-s ours am: 8a7a944fd3
am: aa0afa65c5
am: 77afd98582
...
am: 8e3e7e9f97
-s ours
* commit '8e3e7e9f97867a2e35e91c3c8733f86d5b387f4d':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 22:34:55 +00:00
Josh Gao
8e3e7e9f97
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours am: 75708e52d3
am: 512b191d80
-s ours am: 8a7a944fd3
am: aa0afa65c5
...
am: 77afd98582
* commit '77afd985829024a00aef82f0fb1533a6d4294359':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 22:28:03 +00:00
Josh Gao
ab4ce73702
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
am: c663d0482b
am: 92e0f8f49d
am: 65f7b2d616
am: f25e2dfd3f
...
am: 3ddc5e7d6d
* commit '3ddc5e7d6db27925a4f87fdbcb60eebd16e65952':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 22:27:55 +00:00
Dan Willemsen
fea11c4d1b
Merge "Remove duplicate fdevent.cpp entry" into nyc-dev
2016-02-24 22:23:51 +00:00
Josh Gao
77afd98582
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours am: 75708e52d3
am: 512b191d80
-s ours am: 8a7a944fd3
...
am: aa0afa65c5
* commit 'aa0afa65c573cbc30ed6afb795b27b12a2f29b31':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 22:21:02 +00:00
Josh Gao
3ddc5e7d6d
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
am: c663d0482b
am: 92e0f8f49d
am: 65f7b2d616
...
am: f25e2dfd3f
* commit 'f25e2dfd3f441b6cfbee30a18bb5507dee28349a':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 22:20:48 +00:00
Josh Gao
aa0afa65c5
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours am: 75708e52d3
am: 512b191d80
-s ours
...
am: 8a7a944fd3
* commit '8a7a944fd399dc7f9475b7cc2e06681516156e39':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 22:14:53 +00:00
Josh Gao
f25e2dfd3f
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
am: c663d0482b
am: 92e0f8f49d
...
am: 65f7b2d616
* commit '65f7b2d6169a2a61fe1d607ca55e690721faf31a':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 22:14:05 +00:00
Josh Gao
65f7b2d616
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
am: c663d0482b
...
am: 92e0f8f49d
* commit '92e0f8f49d952b365b2be7715a4320d2451d7a67':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 22:06:23 +00:00
Josh Gao
8a7a944fd3
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours am: 75708e52d3
...
am: 512b191d80
-s ours
* commit '512b191d80f01f514789b33d44b64534708ede51':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 22:06:23 +00:00
Josh Gao
512b191d80
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours
...
am: 75708e52d3
* commit '75708e52d3cced48b4726e71ac94f17cd013ee98':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 21:59:29 +00:00
Josh Gao
92e0f8f49d
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
...
am: c663d0482b
* commit 'c663d0482b67d028e5b30dbe5f45ef7da2b3e5de':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:59:21 +00:00
Josh Gao
c663d0482b
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
...
am: b97b07e55b
* commit 'b97b07e55b4ef4312870398bf658b30b41103403':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:52:52 +00:00
Josh Gao
75708e52d3
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
...
am: 9cde309103
-s ours
* commit '9cde3091033bc367690aa65b814650cdc0e284fe':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 21:46:12 +00:00
Josh Gao
b97b07e55b
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
...
am: 7e10520392
* commit '7e105203923041986a1bd125d86495663fee3abf':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:37:04 +00:00
Josh Gao
9cde309103
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours
...
am: 1eb6ec56c2
* commit '1eb6ec56c28aae79dadb62e63e245745fe9485a1':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 21:36:59 +00:00
Josh Gao
1eb6ec56c2
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE
...
am: bdfb431467
-s ours
* commit 'bdfb43146770f631c7097c378c0dbb8e6f8619a1':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 21:30:37 +00:00
Josh Gao
7e10520392
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours
...
am: adc3bcb1d5
* commit 'adc3bcb1d5e4426273223e0889c7f207abb240f2':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:30:36 +00:00
Josh Gao
adc3bcb1d5
resolve merge conflicts of 9515c23e16
to klp-modular-dev
...
am: 91b48c3796
-s ours
* commit '91b48c37962238e3568d6660aeadfcd4d6eb4207':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:23:55 +00:00
Josh Gao
bdfb431467
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE
...
Change-Id: I51653e2ba8e7d1fa345206a4dd8b15f2e29429f2
2016-02-24 13:20:48 -08:00
James Hawkins
c0188da289
bootstat: Record the time since factory reset on init.
...
Bug: 25448351
Change-Id: I71905a598e74f41c18a96d469c7a6ddd5a2e07fb
(cherry picked from commit 53684ea625
)
2016-02-24 13:19:46 -08:00
Nick Kralevich
53b3982a41
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
am: b760e61686
-s ours am: d5cb8b417b
am: 77dd50b470
am: 89c789ae47
...
am: 4a843ec4e4
-s ours
* commit '4a843ec4e42b02eae240d32a9c206afde186f370':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 21:17:04 +00:00
Nick Kralevich
4a843ec4e4
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
am: b760e61686
-s ours am: d5cb8b417b
am: 77dd50b470
...
am: 89c789ae47
* commit '89c789ae47031eb6bde161991005f7a6e8198556':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 21:06:44 +00:00
Nick Kralevich
89c789ae47
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
am: b760e61686
-s ours am: d5cb8b417b
...
am: 77dd50b470
* commit '77dd50b4707b0b2b12d4ca136d8c0529d18eedc1':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 20:57:19 +00:00
Josh Gao
280cc0a639
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
am: 338f1802ee
am: 3ee4a0be2a
am: 7f0d750b2d
am: 41f72f0537
...
am: f740908c5b
-s ours
* commit 'f740908c5b5f39b47b9ddbe1e54ce27204e1c1aa':
Don't create tombstone directory.
2016-02-24 20:19:01 +00:00
Dan Willemsen
ed1d7aeee4
Remove duplicate fdevent.cpp entry
...
Fixes the following warnings:
build/core/binary.mk:894: warning: overriding commands for target
`out/target/product/bullhead/obj/STATIC_LIBRARIES/libadbd_intermediates/fdevent.o'
build/core/binary.mk:894: warning: ignoring old commands for target
`out/target/product/bullhead/obj/STATIC_LIBRARIES/libadbd_intermediates/fdevent.o'
build/core/binary.mk:894: warning: overriding commands for target
`out/target/product/bullhead/obj_arm/STATIC_LIBRARIES/libadbd_intermediates/fdevent.o'
build/core/binary.mk:894: warning: ignoring old commands for target
`out/target/product/bullhead/obj_arm/STATIC_LIBRARIES/libadbd_intermediates/fdevent.o'
Change-Id: Id4b13574e568284cefbc3a763d40843e73ddbd3d
(cherry picked from commit 582c8fe1d4
)
2016-02-24 12:14:48 -08:00
Josh Gao
91b48c3796
resolve merge conflicts of 9515c23e16
to klp-modular-dev
...
Change-Id: I4b39875ce57bb1ea55898db3ffc004a491bbeaa4
2016-02-24 12:08:28 -08:00
Nick Kralevich
24f4d6495e
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
am: 6d7ce7b14c
am: 077a9ffe40
am: bf8ace32ef
am: a03485daa5
...
am: 9b26997a1f
* commit '9b26997a1fb3fa05886fbe3b66eff656b7c1bc66':
ensure /data/tombstones exists on all Android devices
2016-02-24 20:01:22 +00:00
Josh Gao
f740908c5b
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
am: 338f1802ee
am: 3ee4a0be2a
am: 7f0d750b2d
...
am: 41f72f0537
* commit '41f72f05370fd7fa651131daec5ecd4e89afc9f5':
Don't create tombstone directory.
2016-02-24 19:56:08 +00:00
Nick Kralevich
9b26997a1f
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
am: 6d7ce7b14c
am: 077a9ffe40
am: bf8ace32ef
...
am: a03485daa5
* commit 'a03485daa5491b4315d01d0ef881c4876882db54':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:56:00 +00:00
Nick Kralevich
77dd50b470
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
am: b760e61686
-s ours
...
am: d5cb8b417b
* commit 'd5cb8b417bd938d9c1ef1262df88ed3d90706301':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:55:37 +00:00
Josh Gao
41f72f0537
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
am: 338f1802ee
am: 3ee4a0be2a
...
am: 7f0d750b2d
* commit '7f0d750b2d8907816b3d9b171f2eebda38be6e03':
Don't create tombstone directory.
2016-02-24 19:49:23 +00:00
Nick Kralevich
a03485daa5
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
am: 6d7ce7b14c
am: 077a9ffe40
...
am: bf8ace32ef
* commit 'bf8ace32efb4903642b0e372a5fe939685686467':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:49:12 +00:00
Nick Kralevich
d5cb8b417b
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
...
am: b760e61686
-s ours
* commit 'b760e61686e592eb268ffe667e6c164b0aa29f47':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:48:55 +00:00
Nick Kralevich
b760e61686
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours
...
am: 505a431468
* commit '505a43146861f5e5f3852b2cb47ff8af54d04b75':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:43:01 +00:00
Josh Gao
7f0d750b2d
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
am: 338f1802ee
...
am: 3ee4a0be2a
* commit '3ee4a0be2ae8b21a2235278c88d40b4feb3ddd08':
Don't create tombstone directory.
2016-02-24 19:37:01 +00:00
Nick Kralevich
bf8ace32ef
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
am: 6d7ce7b14c
...
am: 077a9ffe40
* commit '077a9ffe402c0776328bd5a4e85230bba458dc47':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:36:45 +00:00
Josh Gao
3ee4a0be2a
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
...
am: 338f1802ee
* commit '338f1802ee7d87bb4ea2f3fe9ef1c72e1784188b':
Don't create tombstone directory.
2016-02-24 19:31:16 +00:00
Nick Kralevich
505a431468
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
...
am: 75ccd732f3
-s ours
* commit '75ccd732f3fef68fc568d96d00a412920798f55c':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:31:07 +00:00
Nick Kralevich
077a9ffe40
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
...
am: 6d7ce7b14c
* commit '6d7ce7b14c906eff4488bddb0338a38f57eac1de':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:31:04 +00:00
Josh Gao
338f1802ee
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
...
am: 0cf99e2b61
* commit '0cf99e2b618ac5c8a495f607b1978fcd9e3ee827':
Don't create tombstone directory.
2016-02-24 19:25:50 +00:00
Nick Kralevich
75ccd732f3
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours
...
am: d61ebb0851
* commit 'd61ebb085172200c02af73e030646baf3301028c':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:25:39 +00:00
Nick Kralevich
6d7ce7b14c
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
...
am: 4d4eb0db97
* commit '4d4eb0db978bca41727ed21406da42332367de7d':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:25:38 +00:00
Nick Kralevich
d61ebb0851
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
...
am: c61a896f20
-s ours
* commit 'c61a896f2006d76fd3d805ace2282b9590432a67':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:18:41 +00:00
Josh Gao
0cf99e2b61
Don\'t create tombstone directory. am: cb9625cbe5
...
am: 99b8a56616
* commit '99b8a5661614c3b973ab421ecff4ae40249c1579':
Don't create tombstone directory.
2016-02-24 19:11:53 +00:00
Nick Kralevich
4d4eb0db97
ensure /data/tombstones exists on all Android devices am: e2796207ee
...
am: 9660c6759e
* commit '9660c6759e165ddbc91f823672ba9631199ae9dc':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:11:42 +00:00