Commit graph

23261 commits

Author SHA1 Message Date
Paul Lawrence
c27d99aea2 Add fileencrypted=software/ice to fstab options
am: 5b8a108ef5

* commit '5b8a108ef5c9ec2a11a1b7afd4e9d4a4d8444854':
  Add fileencrypted=software/ice to fstab options

Change-Id: I5bc87bb273fed4316a5991e91ce97647ae44c500
2016-05-11 22:20:39 +00:00
Elliott Hughes
b2c88646dd Merge "Report errno more often in fastboot." am: 8c5384e50b am: 272b2694cd
am: 7f80f04a2c

* commit '7f80f04a2ce9b3fa28be456c89c50a5fd2b5923d':
  Report errno more often in fastboot.

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

* commit '17decbd637ab9dba0d87ea8cb92867c4117b5a7d':
  Move linker-namespace functions declarations

Change-Id: Ic40bfbc3e1c087f21163193462affa178ed82ce2
2016-05-11 21:51:09 +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
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
2be0ffb71a Merge "Add a fortify test to crasher." am: e674d32d2d am: 4434b42cd0
am: 69541606c1

* commit '69541606c1a6b6e1ee8b3b59fa5d592aee3e6851':
  Add a fortify test to crasher.

Change-Id: I62e668bb7d7b07fbc7f84543714ba37aee5c27c0
2016-05-11 18:02:51 +00: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
Paul Lawrence
5b8a108ef5 Add fileencrypted=software/ice to fstab options
Bug: 28616054
Change-Id: If9dd4a17641412607ca4e4fed7f7dbf661ff0d25
2016-05-11 07:34:47 -07:00
Dimitry Ivanov
37add30d32 Merge "nativeloader: Ignore empty java_permitted_path" am: 39d1230ee3 am: ed4c0be382
am: 2be1699262

* commit '2be1699262e5352001c9cf1e906a8da888bc0c80':
  nativeloader: Ignore empty java_permitted_path

Change-Id: I664f48c9fcc0549eaab5b37f5ef0d7b61390e1c1
2016-05-11 07:46:08 +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
Android Build Merger (Role)
f5fe79ed47 Merge "Merge "nativeloader: Ignore empty java_permitted_path" into nyc-dev am: 6edd0c3a68 am: d7cbb6f053" into nyc-mr1-dev-plus-aosp 2016-05-11 05:05:52 +00:00
Dimitry Ivanov
adf02703dd Merge "nativeloader: Ignore empty java_permitted_path" into nyc-dev am: 6edd0c3a68
am: bd8c47e2d4

* commit 'bd8c47e2d459c10910c1ce2333f2ca25c710969d':
  nativeloader: Ignore empty java_permitted_path

Change-Id: I013523f7655b6060115ac47bf1bb0939f099bb3a
2016-05-11 05:05:40 +00:00
Dimitry Ivanov
2413715383 Merge "nativeloader: Ignore empty java_permitted_path" into nyc-dev am: 6edd0c3a68
am: d7cbb6f053

* commit 'd7cbb6f053c29c9967c25b5723be32ae6d26f97d':
  nativeloader: Ignore empty java_permitted_path

Change-Id: I52ace7c3de380e0b0aa3202b6e07a003222f0d30
2016-05-11 05:05:39 +00:00
Dimitry Ivanov
bd8c47e2d4 Merge "nativeloader: Ignore empty java_permitted_path" into nyc-dev
am: 6edd0c3a68

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

Change-Id: I82e39b78ac4ba67018a2d78c24b77ace01a6f2e8
2016-05-11 05:03:07 +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
db38cb7a7a Merge "Check if public namespace has already been initialized" am: 0756fae4f1 am: 5cd1e6822a
am: ddc6a4a0a6

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

Change-Id: Iff61a79dfe5fafea0a08d0d66431fb9b74ab3f5a
2016-05-11 01:33:19 +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
fdcbb2263a Merge "Extend white-listed directories to include /mnt/expand" am: 3fb5f13806 am: a5c037143c
am: 8f79183a11

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

Change-Id: I180824317f10dba42a7535667afb7744522f214d
2016-05-10 23:29:33 +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
Android Build Merger (Role)
5f53f6e1cd Merge "Merge "Wipe device on policy error" into nyc-dev am: 8a59fa8524 am: 71bac3fa4b" into nyc-mr1-dev-plus-aosp 2016-05-10 22:19:54 +00:00
Paul Crowley
31a09f6475 Merge "Wipe device on policy error" into nyc-dev am: 8a59fa8524
am: 2b2e3f1130

* commit '2b2e3f1130e90797e89cf3477db29c413a494778':
  Wipe device on policy error

Change-Id: Id77730e5da423be2b86a1ebf5d05efabf7e5feb5
2016-05-10 22:19:42 +00:00
Paul Crowley
3b24944f49 Merge "Wipe device on policy error" into nyc-dev am: 8a59fa8524
am: 71bac3fa4b

* commit '71bac3fa4b519ff9aa537a3ef6b7242b5c8f848c':
  Wipe device on policy error

Change-Id: Ie2eac0c6570a9c714f4966c054e9b41b36c09053
2016-05-10 22:19:41 +00: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
2b2e3f1130 Merge "Wipe device on policy error" into nyc-dev
am: 8a59fa8524

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

Change-Id: I211e83f34ff89ebe6120c952994c54a331165b93
2016-05-10 22:17:07 +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
7c5a70cfbf Extend white-listed directories to include /mnt/expand am: f334cbf0e1
am: ff38020da1

* commit 'ff38020da1ae52b6b3c20918a8570ac44031ce34':

Change-Id: Ieae412891a862329d5882beaaa3e94cde8c9b1b3
2016-05-10 19:33:11 +00:00
Dimitry Ivanov
899bcddda7 Extend white-listed directories to include /mnt/expand am: f334cbf0e1
am: b3bf7a5b88

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

Change-Id: Ic855b225e67a7fdfeded766a382db8a4f1a41444
2016-05-10 19:31:11 +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
Dimitry Ivanov
ff38020da1 Extend white-listed directories to include /mnt/expand
am: f334cbf0e1

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

Change-Id: I378ed0ea80684585ca7daa833b91336a8d38c98c
2016-05-10 19:26:45 +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
3b7c8b98dc Merge "<cutils/atomic.h> has been inlined for two years now." am: c5016de66b am: 23e1312720
am: bc72a54073

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

Change-Id: I8f07cac8e93a5d392e8e7bf0eb051888b572b4f0
2016-05-10 16:06:38 +00:00