Commit graph

23052 commits

Author SHA1 Message Date
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
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
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
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
Dimitry Ivanov
179fea40bb Merge "nativeloader: Fix the case of search_path == null" 2016-05-09 19:17:10 +00:00
Rubin Xu
8d3f5c395d Return correct length from pmsgRead()
am: 08660a811e

* commit '08660a811e078d3a6ce950a340a1b9071cfd7e8d':
  Return correct length from pmsgRead()

Change-Id: Ie3418e58f3c53b89276b6601cd0fa1fe7c1eb448
2016-05-09 18:13:43 +00:00
Dimitry Ivanov
8a0425b86a 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
2016-05-09 10:55:50 -07:00
Rubin Xu
08660a811e Return correct length from pmsgRead()
Bug: 28610769
Change-Id: I38cac786ca43ef8d9530f4e2e5a0bdd4cc3bccef
2016-05-09 16:53:30 +00:00
Rubin Xu
7dcdd52cf6 Merge "Return correct length from pmsgRead()" am: fc2a8b2bd6
am: a76e171bf3

* commit 'a76e171bf351e3d26b3eb596188b6c9b2fcab3f4':
  Return correct length from pmsgRead()

Change-Id: I616c3c889e99292454b0a7c33f999a56ada2c939
2016-05-09 15:36:23 +00:00
Rubin Xu
a76e171bf3 Merge "Return correct length from pmsgRead()"
am: fc2a8b2bd6

* commit 'fc2a8b2bd605e4639db0feaab49c516c0ae90180':
  Return correct length from pmsgRead()

Change-Id: I868b2ad0258edd409f10fdf8bfb27f44c39de77d
2016-05-09 15:32:15 +00:00
Treehugger Robot
fc2a8b2bd6 Merge "Return correct length from pmsgRead()" 2016-05-09 15:22:43 +00:00
Dimitry Ivanov
b91425132e Merge "Add public libs from an environment variable" into nyc-dev
am: ea41a18c93

* commit 'ea41a18c933d20264b89fc89febf387231dc0c24':
  Add public libs from an environment variable

Change-Id: I7242f8f223cb331fa7f4ffa8084f0bde851ec4f9
2016-05-06 22:03:13 +00:00
TreeHugger Robot
ea41a18c93 Merge "Add public libs from an environment variable" into nyc-dev 2016-05-06 21:57:11 +00:00
Josh Gao
2928f7df70 Merge "adb: search for a maximum of 16 emulators." into nyc-dev
am: 72e47300fb

* commit '72e47300fb2d7842509c492fcb8ee363d43ef446':
  adb: search for a maximum of 16 emulators.

Change-Id: I51d01d4d1d8985c37c6cf3c4dbaa19eba49ae306
2016-05-06 21:32:31 +00:00
Josh Gao
72e47300fb Merge "adb: search for a maximum of 16 emulators." into nyc-dev 2016-05-06 21:23:28 +00:00
Dimitry Ivanov
7d02829636 Add public libs from an environment variable
This is enabled only for builds with ro.debuggable=1
It is intended for use only in tests using dalvikvm
and needing access to platform libraries.

Bug: http://b/28449304
Change-Id: I402457d0da542996ccf265aeaa305f09881e4333
(cherry picked from commit 4ddabd01bf)
2016-05-06 13:16:45 -07:00
Dimitry Ivanov
c3cd14b7b8 Merge "Add public libs from an environment variable" am: c6160d2a0e
am: 9e351d2f2b

* commit '9e351d2f2bd945aa1fe5efbb0f512d14381d613c':
  Add public libs from an environment variable

Change-Id: Ie7f9c1f8f4d94641eab60d2ae7c7b11fe5031022
2016-05-06 20:01:03 +00:00
Dimitry Ivanov
9e351d2f2b Merge "Add public libs from an environment variable"
am: c6160d2a0e

* commit 'c6160d2a0ef648ccb3d217c589c60b5c00b80387':
  Add public libs from an environment variable

Change-Id: I2be47c2e9fc02860e7ddd79b97f666c9ea6e881b
2016-05-06 19:56:13 +00:00
Dimitry Ivanov
c6160d2a0e Merge "Add public libs from an environment variable" 2016-05-06 19:44:17 +00:00
Dimitry Ivanov
4ddabd01bf Add public libs from an environment variable
This is enabled only for builds with ro.debuggable=1
It is intended for use only in tests using dalvikvm
and needing access to platform libraries.

Bug: http://b/28449304
Change-Id: I402457d0da542996ccf265aeaa305f09881e4333
2016-05-06 11:39:47 -07:00
Josh Gao
9fe742684c adb: search for a maximum of 16 emulators.
Android Wear has unfortunately been using port 5601 for years, which
falls into the range of ports we were previously polling for Android
emulators. Reduce the maximum number of emulators we can support so
that 5601 no longer falls within our range.

Bug: http://b/26468076
Change-Id: I931809cfa412122f4781eebe0164facab12c95f0
2016-05-06 11:27:19 -07:00
Nick Kralevich
478c557145 Merge "enable integer sanitizer for sdcard service" am: 532ab82e10
am: 2f67f4687b

* commit '2f67f4687b94bcead719d504ea4f77571ae84b3b':
  enable integer sanitizer for sdcard service

Change-Id: Ib54476445c01a1f5bd6234aec66c7019939a3858
2016-05-06 17:10:38 +00:00
Daniel Micay
2f67f4687b Merge "enable integer sanitizer for sdcard service"
am: 532ab82e10

* commit '532ab82e1066837e8a70c64fcee9d083f7cd04b7':
  enable integer sanitizer for sdcard service

Change-Id: Ia732087fed56c1a86303cdd5398bec629ba14e31
2016-05-06 17:05:48 +00:00
Nick Kralevich
532ab82e10 Merge "enable integer sanitizer for sdcard service" 2016-05-06 16:58:56 +00:00
Christopher Ferris
a030a43c43 Merge "Set groups before dropping privileges." am: f34304019d
am: 66c17d54e2

* commit '66c17d54e25239dd85079e115f1af7bf8a45edf8':
  Set groups before dropping privileges.

Change-Id: I94f4b9b4da1a3ec020c80ba3e13d47219f18928b
2016-05-06 01:19:05 +00:00
Christopher Ferris
66c17d54e2 Merge "Set groups before dropping privileges."
am: f34304019d

* commit 'f34304019d464de0c03fe62ca7fd9e158afb598c':
  Set groups before dropping privileges.

Change-Id: If5396c913cfed13c01bd06d6a5d781439e5f6876
2016-05-06 01:14:16 +00:00
Treehugger Robot
f34304019d Merge "Set groups before dropping privileges." 2016-05-06 01:08:14 +00:00
Christopher Ferris
b2dd62f3fd Merge "Fix null pointer dereference." am: 830561bb2b
am: 05c5ef4757

* commit '05c5ef4757811a7231848799b616e71b6cb9a60d':
  Fix null pointer dereference.

Change-Id: If13e8462508ff9da69e3550dab0530f4e5b8daff
2016-05-05 22:55:18 +00:00
Christopher Ferris
05c5ef4757 Merge "Fix null pointer dereference."
am: 830561bb2b

* commit '830561bb2b34ca8c09be4860380e9032202c3112':
  Fix null pointer dereference.

Change-Id: I82a4e97c61c1d3aaef1e4af1292cab06eb804ccc
2016-05-05 22:50:38 +00:00
Christopher Ferris
8b474de4ac Set groups before dropping privileges.
The code for dumping tombstones tries to read the log data. This was
silently failing after the change to drop root privileges. Fix this
by explicitly setting the groups allowed before dropping privileges.

Bug: 28590884
(cherry picked from commit edc2380109)

Change-Id: I225365edccb11f8752027566fd42f3b10ce10260
2016-05-05 15:47:16 -07:00
Treehugger Robot
830561bb2b Merge "Fix null pointer dereference." 2016-05-05 22:44:04 +00:00
Christopher Ferris
f89a23f27b Merge "Set groups before dropping privileges." into nyc-dev
am: fd1eee58f9

* commit 'fd1eee58f985b3d528ca352ff278d7b200390ab2':
  Set groups before dropping privileges.

Change-Id: I85c98abb0e7cc3b36ec714899540d65e6ca908c7
2016-05-05 21:57:30 +00:00
Christopher Ferris
fd1eee58f9 Merge "Set groups before dropping privileges." into nyc-dev 2016-05-05 21:49:43 +00:00