Commit graph

23081 commits

Author SHA1 Message Date
Irina Patru
12397f202f Merge "init.rc: Remove cpu weight set on the root cgroup" am: 422492c506
am: 2618d90c2f

* commit '2618d90c2fa3f952a195dfd4ecd9f92ec462bccb':
  init.rc: Remove cpu weight set on the root cgroup

Change-Id: I2663c368032a3c9f851de7d1e47f68c3a25b0d52
2016-05-12 18:13:14 +00:00
Irina Patru
2618d90c2f Merge "init.rc: Remove cpu weight set on the root cgroup"
am: 422492c506

* commit '422492c5063956e4f69bdbe01a30b0bc54a5fb2c':
  init.rc: Remove cpu weight set on the root cgroup

Change-Id: I23bf6dda65cc795efc0babb5a8806e74fd0e7ed1
2016-05-12 18:10:07 +00:00
Treehugger Robot
422492c506 Merge "init.rc: Remove cpu weight set on the root cgroup" 2016-05-12 18:05:46 +00:00
Mark Salyzyn
5d76be85a4 Merge "liblog: sleep 20ms before critical property_set" am: 1d560ff24a
am: 03ac8fe0be

* commit '03ac8fe0be882b09d7faba4d5f96e536a94198ab':
  liblog: sleep 20ms before critical property_set

Change-Id: I91d3262a478f83556851881208fb1f83de62f189
2016-05-12 16:48:21 +00:00
Mark Salyzyn
03ac8fe0be Merge "liblog: sleep 20ms before critical property_set"
am: 1d560ff24a

* commit '1d560ff24a30dfac9f8e71847883ca4fef5f953c':
  liblog: sleep 20ms before critical property_set

Change-Id: I09197251d8ba5efb87c47e3e496bfe1c826e8688
2016-05-12 16:45:51 +00:00
Treehugger Robot
1d560ff24a Merge "liblog: sleep 20ms before critical property_set" 2016-05-12 16:38:07 +00:00
Mark Salyzyn
5cceee6404 liblog: sleep 20ms before critical property_set
Going too fast can result in the property not being set
and causing an extreme corner case failure being reported
and blamed on is_loggable functionality.

Bug: 25792367
Change-Id: Idda6f67d655d8a84d2809daf695394d5293e7431
2016-05-12 15:58:57 +00:00
Irina Patru
c560c6310f init.rc: Remove cpu weight set on the root cgroup
It isn't allowed to change the cpu.share value for the root cgroup.
See kernel commit:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ec7dc8ac73e4a56ed03b673f026f08c0d547f597

This fixes the following error seen in dmesg:
init: write_file: Unable to write to '/dev/cpuctl/cpu.shares': Invalid argument

BUG: 28735908

Change-Id: I5ef359fb275792f99d13d35c62499026d354f6af
Signed-off-by: Irina Patru <irina.patru@intel.com>
2016-05-12 14:57:31 +03:00
Dimitry Ivanov
f031971771 Move linker-namespace functions declarations
am: c337cae9ad

* commit 'c337cae9adcb538a4562641f97bdde933d085a82':
  Move linker-namespace functions declarations

Change-Id: Iab15bb8cf23a5fa342f7c51d05322ccd6c54958e
2016-05-12 00:45:33 +00:00
Elliott Hughes
7f80f04a2c Merge "Report errno more often in fastboot." am: 8c5384e50b
am: 272b2694cd

* commit '272b2694cd3556120a3e39b88a0702103e2ed58a':
  Report errno more often in fastboot.

Change-Id: Ie26d2c70e65b70c08017f848f21fb91d6f20e3a4
2016-05-11 21:50:07 +00:00
Elliott Hughes
272b2694cd Merge "Report errno more often in fastboot."
am: 8c5384e50b

* commit '8c5384e50bfbc97e4b4ea74e52391879a09b68fa':
  Report errno more often in fastboot.

Change-Id: I19a33597f29c1974063d4308eeccea60bbb350f5
2016-05-11 21:39:00 +00:00
Dimitry Ivanov
17decbd637 Merge "Move linker-namespace functions declarations" am: 37ed923d1c
am: 3f0a12622b

* commit '3f0a12622b8d35f1223945498a086e19c791bf24':
  Move linker-namespace functions declarations

Change-Id: I6f3e8b5ef608e3b930510b5c483ec6e7963eb4f7
2016-05-11 21:29:15 +00:00
Elliott Hughes
8c5384e50b Merge "Report errno more often in fastboot." 2016-05-11 21:27:44 +00:00
Dimitry Ivanov
3f0a12622b Merge "Move linker-namespace functions declarations"
am: 37ed923d1c

* commit '37ed923d1c08b8b9204a6a66f11bbf0b4375d35b':
  Move linker-namespace functions declarations

Change-Id: I91b184943a9a1cfa286f7e8ebb2df21f34063a3d
2016-05-11 21:22:02 +00:00
Dimitry Ivanov
c337cae9ad Move linker-namespace functions declarations
They are intended for platform use only and we shouldn't have them
in the public header file. This CL moves them to libnativeloader
private header file.

Bug: http://b/28174921
Change-Id: I01cf446d2d8d7cf6f9e31130aa3d4e54fbbbb9fc
(cherry picked from commit 6796522256)
2016-05-11 14:20:12 -07:00
Dimitry Ivanov
37ed923d1c Merge "Move linker-namespace functions declarations" 2016-05-11 21:14:41 +00:00
Elliott Hughes
53ec495b40 Report errno more often in fastboot.
Change-Id: I4b4b47c584a146b38876a379f26ceb20d071c643
2016-05-11 12:39:27 -07:00
Elliott Hughes
69541606c1 Merge "Add a fortify test to crasher." am: e674d32d2d
am: 4434b42cd0

* commit '4434b42cd0bd36be4ca7702e840886f67daaff2d':
  Add a fortify test to crasher.

Change-Id: I3b8b473aa256b7de7ca5e50e14b32d0c3b0565e1
2016-05-11 17:59:47 +00:00
Elliott Hughes
4434b42cd0 Merge "Add a fortify test to crasher."
am: e674d32d2d

* commit 'e674d32d2d2816255c836cb7eed51eee6c9e8147':
  Add a fortify test to crasher.

Change-Id: I7d4c1342c514c73d195ad970703bb20338633db8
2016-05-11 17:56:16 +00:00
Elliott Hughes
e674d32d2d Merge "Add a fortify test to crasher." 2016-05-11 17:47:21 +00:00
Dimitry Ivanov
2be1699262 Merge "nativeloader: Ignore empty java_permitted_path" am: 39d1230ee3
am: ed4c0be382

* commit 'ed4c0be382e87b09d08af82bd134970ceaaec3a4':
  nativeloader: Ignore empty java_permitted_path

Change-Id: Ib45cebd1cc2c8b9f64ebb7737c699930d374c5a9
2016-05-11 07:43:34 +00:00
Dimitry Ivanov
ed4c0be382 Merge "nativeloader: Ignore empty java_permitted_path"
am: 39d1230ee3

* commit '39d1230ee31c704e95ec45048ff812a2b6aae5bf':
  nativeloader: Ignore empty java_permitted_path

Change-Id: Iab7b81414593760f4a9d5b02a5be3ea6f6b9720a
2016-05-11 07:40:59 +00:00
Dimitry Ivanov
39d1230ee3 Merge "nativeloader: Ignore empty java_permitted_path" 2016-05-11 07:36:31 +00:00
Dimitry Ivanov
d7cbb6f053 Merge "nativeloader: Ignore empty java_permitted_path" into nyc-dev
am: 6edd0c3a68

* commit '6edd0c3a68f60541c31fd65080e52939f2be3bc2':
  nativeloader: Ignore empty java_permitted_path

Change-Id: I1777b3a05d2e233000815172cfa1e56326be634b
2016-05-11 05:03:07 +00:00
Dimitry Ivanov
72ca40f738 nativeloader: Ignore empty java_permitted_path
Passing empty permitted path should result in no-op.
This addresses review comment on CL with commit
f334cbf0e1

Bug: http://b/28639227
Change-Id: I4a4540e522e90a145a374939921932c86f35e88d
(cherry picked from commit d0b1531929)
2016-05-10 22:02:05 -07:00
Dimitry Ivanov
6edd0c3a68 Merge "nativeloader: Ignore empty java_permitted_path" into nyc-dev 2016-05-11 04:58:17 +00:00
Dimitry Ivanov
ddc6a4a0a6 Merge "Check if public namespace has already been initialized" am: 0756fae4f1
am: 5cd1e6822a

* commit '5cd1e6822abd016e5ee6e642528b39acaf15ae55':
  Check if public namespace has already been initialized

Change-Id: I13740764783765256af2fb1672fbfc5592147760
2016-05-11 01:30:32 +00:00
Dimitry Ivanov
5cd1e6822a Merge "Check if public namespace has already been initialized"
am: 0756fae4f1

* commit '0756fae4f1aea5072ed820087b2487b408194c38':
  Check if public namespace has already been initialized

Change-Id: Ia338baa984c3ca310f4a30db1d094704607e5cc9
2016-05-11 01:27:55 +00:00
Dimitry Ivanov
0756fae4f1 Merge "Check if public namespace has already been initialized" 2016-05-11 01:23:20 +00:00
Dimitry Ivanov
d0b1531929 nativeloader: Ignore empty java_permitted_path
Passing empty permitted path should result in no-op.
This addresses review comment on CL with commit
f334cbf0e1

Bug: http://b/28639227
Change-Id: I4a4540e522e90a145a374939921932c86f35e88d
2016-05-10 17:32:38 -07:00
Dimitry Ivanov
8f79183a11 Merge "Extend white-listed directories to include /mnt/expand" am: 3fb5f13806
am: a5c037143c

* commit 'a5c037143c15118810e50d24bf43638d5f2e398e':
  Extend white-listed directories to include /mnt/expand

Change-Id: If007e28cc6d8618cb84b0e08a85a86cbd3b07d3c
2016-05-10 23:24:31 +00:00
Dimitry Ivanov
a5c037143c Merge "Extend white-listed directories to include /mnt/expand"
am: 3fb5f13806

* commit '3fb5f1380671b6b9d3b511fc2b80051a14313dec':
  Extend white-listed directories to include /mnt/expand

Change-Id: I106dac170a9acb80835082916e6aa09328e5fb11
2016-05-10 23:21:44 +00:00
Treehugger Robot
3fb5f13806 Merge "Extend white-listed directories to include /mnt/expand" 2016-05-10 23:17:27 +00:00
Dimitry Ivanov
637da4eeeb Extend white-listed directories to include /mnt/expand
Apps on sdcard live under /mnt/expand and therefore
this directory should be under linker namespaces
permitted_path.

Bug: http://b/28639227
Change-Id: I462f9f23656c95d9c2a48bb3f513abcd9d08f340
(cherry picked from commit f334cbf0e1)
2016-05-10 15:31:18 -07:00
Paul Crowley
71bac3fa4b Merge "Wipe device on policy error" into nyc-dev
am: 8a59fa8524

* commit '8a59fa85243a5f748108279f6d30b01292518b0a':
  Wipe device on policy error

Change-Id: I35205b2ddf8b3e8d049525e3717d27836d6c59a2
2016-05-10 22:17:08 +00:00
Paul Crowley
8a59fa8524 Merge "Wipe device on policy error" into nyc-dev 2016-05-10 22:12:49 +00:00
Elliott Hughes
23d1cad9e0 Add a fortify test to crasher.
Change-Id: I675dbeaa39529583be5877946fd38b94ec341315
2016-05-10 14:44:59 -07:00
Dimitry Ivanov
b3bf7a5b88 Extend white-listed directories to include /mnt/expand
am: f334cbf0e1

* commit 'f334cbf0e1425633bef96a21b0ce9e30f4c6ffa9':
  Extend white-listed directories to include /mnt/expand

Change-Id: I2a278a015ae2e5f06936fb7241af4003bf9076df
2016-05-10 19:26:46 +00:00
Paul Crowley
af8be58ca2 Wipe device on policy error
If we fail to set a crypto policy on a system-DE directory, this is a
serious and unrecoverable condition; the only way forward is to erase
the entire device. In a future commit we will also allow users the
option of booting again.

Bug: 28318405
Change-Id: Iff1e52c5bbee1beed29dc4b609d24bfeb7d138da
2016-05-10 11:04:39 -07:00
Dimitry Ivanov
f334cbf0e1 Extend white-listed directories to include /mnt/expand
Apps on sdcard live under /mnt/expand and therefore
this directory should be under linker namespaces
permitted_path.

Bug: http://b/28639227
Change-Id: I462f9f23656c95d9c2a48bb3f513abcd9d08f340
2016-05-10 10:39:48 -07:00
Elliott Hughes
bc72a54073 Merge "<cutils/atomic.h> has been inlined for two years now." am: c5016de66b
am: 23e1312720

* commit '23e1312720c45944646f68379c1f15fcd8434da8':
  <cutils/atomic.h> has been inlined for two years now.

Change-Id: Ia4205030c07494149b8392abf74ec29ebd463724
2016-05-10 16:03:51 +00:00
Elliott Hughes
23e1312720 Merge "<cutils/atomic.h> has been inlined for two years now."
am: c5016de66b

* commit 'c5016de66b6d778dd7c292e215aad6b5c079e92c':
  <cutils/atomic.h> has been inlined for two years now.

Change-Id: Icc28b866c2dd081d1047263c7cfaea05d20975f6
2016-05-10 16:01:20 +00:00
Elliott Hughes
c5016de66b Merge "<cutils/atomic.h> has been inlined for two years now." 2016-05-10 15:55:22 +00:00
Dimitry Ivanov
80ddb8f551 Check if public namespace has already been initialized
There is no point in reading/loading the list of public
libraries once public namespace is already initialized.

Change-Id: I5a53c46bb57b8de241ba521a6321c12e94a76476
2016-05-09 18:12:00 -07:00
Dimitry Ivanov
6796522256 Move linker-namespace functions declarations
They are intended for platform use only and we shouldn't have them
in the public header file. This CL moves them to libnativeloader
private header file.

Bug: http://b/28174921
Change-Id: I01cf446d2d8d7cf6f9e31130aa3d4e54fbbbb9fc
2016-05-09 18:09:06 -07:00
Elliott Hughes
103e8f5608 <cutils/atomic.h> has been inlined for two years now.
Change-Id: If4f817acc054d7336df09a5b8dde34693e0e96a5
2016-05-09 15:11:56 -07:00
Dimitry Ivanov
b3180e43c0 nativeloader: Fix the case of search_path == null
am: cf9892b6d1

* commit 'cf9892b6d1b0138bdf2341aaa0670c43af27cb85':
  nativeloader: Fix the case of search_path == null

Change-Id: I20b6f0bb1bdade7accfd9491a42594fa44ce5f6a
2016-05-09 21:12:33 +00:00
Dimitry Ivanov
d4e38524c3 resolve merge conflicts of 1a3ac02 to nyc-dev-plus-aosp
Change-Id: Ia658c3dfd2cc5f19977ae48d9a3d543dd6faa01a
2016-05-09 12:58:54 -07:00
Dimitry Ivanov
cf9892b6d1 nativeloader: Fix the case of search_path == null
When user creates custom classloader which does not extend
BaseDexClassLoader the librarySearchPath gets set to null
by java.lang.Runtime.doLoad().

This patch makes nativeloader correctly handle it.

Bug: http://b/28659864
Change-Id: I1b61c6bc952984d7c49775a9178fc3270948e62a
(cherry picked from commit 8a0425b86a)
2016-05-09 12:21:55 -07:00
Dimitry Ivanov
1a3ac02e4c Merge "nativeloader: Fix the case of search_path == null"
am: 179fea40bb

* commit '179fea40bb1ed2da183f3a2a6398d1c68b9f6f32':
  nativeloader: Fix the case of search_path == null

Change-Id: Idb502568c161693877c30bb7cd085e974433aa8f
2016-05-09 19:21:26 +00:00