Commit graph

1509 commits

Author SHA1 Message Date
Paul Lawrence
b451785495 Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f am: e72c338
am: 85dfdb0

* commit '85dfdb082d87e2e17e69cc74d5b773959b15645c':
  Don't start defaultcrypto twice

Change-Id: Ia3c7998a00bc96dfbb211bfdf733eb22708ad13a
2016-04-19 14:53:04 +00:00
Paul Lawrence
6f136e8423 Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f
am: c771d20

* commit 'c771d2086043d7b7d665a18b003937b1e142b7f0':

Change-Id: Iabd62fdefbf3ea43833bc2fdb9364d51a5bba779
2016-04-19 14:52:42 +00:00
Paul Lawrence
85dfdb082d Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f
am: e72c338

* commit 'e72c33872e2105ca1e63ba4f891ac68a6330dffa':
  Don't start defaultcrypto twice

Change-Id: Ibad904c5df684b03b80771a6a90c6a1ee49e073f
2016-04-19 14:50:07 +00:00
Paul Lawrence
c771d20860 Merge "Don\'t start defaultcrypto twice" into nyc-dev
am: 0264d8f

* commit '0264d8ff7c2d5a2cdb4faaf9a3493103138373dd':
  Don't start defaultcrypto twice

Change-Id: I39951628d41f656901658cd82a56298ef9f663ec
2016-04-19 14:47:13 +00:00
Paul Lawrence
e72c33872e Merge "Don\'t start defaultcrypto twice" into nyc-dev
am: 0264d8f

* commit '0264d8ff7c2d5a2cdb4faaf9a3493103138373dd':
  Don't start defaultcrypto twice

Change-Id: Ief95c3bf7798cf6090f68fb2eac124677d448187
2016-04-19 14:47:08 +00:00
Paul Lawrence
0264d8ff7c Merge "Don't start defaultcrypto twice" into nyc-dev 2016-04-19 14:44:26 +00:00
Paul Lawrence
84274cc35c Don't start defaultcrypto twice
The old way (using triggers) starts defaultcrypto twice because
queue_property_triggers_action retriggers the action.

Bug: 27452459

Change-Id: I715d5441f8ae0b820b680f6a75f51694c4420992
2016-04-18 15:39:04 -07:00
Jeff Sharkey
ce63cbc774 Consistent creation/destruction of user data. am: be70c9a am: c85be2f
am: e34f078

* commit 'e34f078ab1c39048851c339224bf5af01c2ebada':

Change-Id: Iffada0a86632ce9be14f0bce36b19aa4cd6da529
2016-04-18 20:18:35 +00:00
Jeff Sharkey
e480434c69 Consistent creation/destruction of user data. am: be70c9a am: 30b0a1f
am: 0068f8e

* commit '0068f8e4907b82708822279dabf4710df3680beb':
  Consistent creation/destruction of user data.

Change-Id: I74206efb6610e72151878f6c432980b0293bea0e
2016-04-18 20:18:34 +00:00
Jeff Sharkey
e34f078ab1 Consistent creation/destruction of user data. am: be70c9a
am: c85be2f

* commit 'c85be2fc40ec7d7a70fee4b19325de21ff085724':

Change-Id: I93288ad9c962639dbfa63e33395f0ac3952b045b
2016-04-18 20:15:17 +00:00
Jeff Sharkey
0068f8e490 Consistent creation/destruction of user data. am: be70c9a
am: 30b0a1f

* commit '30b0a1fcdd2c7a60c104ffcd3dca4c9c2c1e682b':
  Consistent creation/destruction of user data.

Change-Id: I72e91bbf15eaf91c72a61a26baf2e6908934958a
2016-04-18 20:05:56 +00:00
Jeff Sharkey
30b0a1fcdd Consistent creation/destruction of user data.
am: be70c9a

* commit 'be70c9ae2251ac8f3bfbbe75146f8c533d64e01b':
  Consistent creation/destruction of user data.

Change-Id: I55f4fe88a8c02d019fa92028e6ad358fc0f75aeb
2016-04-18 19:59:55 +00:00
Jeff Sharkey
c85be2fc40 Consistent creation/destruction of user data.
am: be70c9a

* commit 'be70c9ae2251ac8f3bfbbe75146f8c533d64e01b':
  Consistent creation/destruction of user data.

Change-Id: Iddb906f6df0587faf95198446c376b2e8d550bec
2016-04-18 19:59:50 +00:00
Jeff Sharkey
be70c9ae22 Consistent creation/destruction of user data.
Preparing and destroying users currently needs to be split across
installd, system_server, and vold, since no single party has all the
required SELinux permissions.

Bug: 27896918, 25861755
Change-Id: Ieec14ccacfc7a3a5ab00df47ace7318feb900c38
2016-04-15 13:47:52 -06:00
Martijn Coenen
624ec66b26 Move vold (and sdcard childs) to foreground cpuset.
Bug: 24949295
Change-Id: I7118a374db90ede517a92f72763d624b9a234ea7
2016-04-15 14:30:40 +02:00
Mattias Nissler
7634807192 resolve merge conflicts of 81fd991 to nyc-dev-plus-aosp
am: ccd9dd5

* commit 'ccd9dd53f8a55b296eb0671acefc9f0163fd83b4':
  Switch to BoringSSL crypto.

Change-Id: Icc997e054801181ab99cbd9a77cd209b93ec9cd3
2016-04-13 01:56:49 +00:00
Dan Austin
6a127c09a8 Merge "Address const issues in preparation for libcxx rebase." am: a4f7dad am: 3cc69fa
am: 8afff3b

* commit '8afff3bfe18320cece8b5601478a34c313a5ad46':
  Address const issues in preparation for libcxx rebase.

Change-Id: Ic64c71deda5f1ca154f2e3fd281500e7142eff6b
2016-04-13 01:56:49 +00:00
Elliott Hughes
ccd9dd53f8 resolve merge conflicts of 81fd991 to nyc-dev-plus-aosp
Change-Id: Iabda2c9ad05ed4aa0a078c5da40b887f36dd9328
2016-04-12 16:44:04 -07:00
Mattias Nissler
81fd991d8b Merge "Switch to BoringSSL crypto."
am: af458c4

* commit 'af458c478a9f333fa39bdddb9a7aa097a2196b64':
  Switch to BoringSSL crypto.

Change-Id: Ie3c9a05bfd05dfa9b1a79fe42b59d0dfb3346843
2016-04-12 23:27:37 +00:00
Elliott Hughes
af458c478a Merge "Switch to BoringSSL crypto." 2016-04-12 23:12:35 +00:00
Dan Austin
8afff3bfe1 Merge "Address const issues in preparation for libcxx rebase." am: a4f7dad
am: 3cc69fa

* commit '3cc69faa6797ae0cfe43f4243d564fbe14f4cfe4':
  Address const issues in preparation for libcxx rebase.

Change-Id: I58f814d71e5d5c067ade613d0bf8a88911d53424
2016-04-12 22:35:50 +00:00
Dan Austin
3cc69faa67 Merge "Address const issues in preparation for libcxx rebase."
am: a4f7dad

* commit 'a4f7dadd389e25d2b5749d1edf65081b3a4e6961':
  Address const issues in preparation for libcxx rebase.

Change-Id: I63c3a205db98d956c3c02a4f4f6fd87fd4e052e8
2016-04-12 22:33:13 +00:00
Dan Austin
a4f7dadd38 Merge "Address const issues in preparation for libcxx rebase." 2016-04-12 22:21:17 +00:00
Yabin Cui
baeb3b4816 Merge "vold: write bootloader message directly." into nyc-dev am: cbedcc3
am: 008c7dd

* commit '008c7ddb1fe7743f780801c1cf219a3c25445401':
  vold: write bootloader message directly.

Change-Id: I10a098025619c4f32db3ce551a4b85e14a9558a8
2016-04-09 23:12:41 +00:00
Yabin Cui
008c7ddb1f Merge "vold: write bootloader message directly." into nyc-dev
am: cbedcc3

* commit 'cbedcc30b32d79d77d89f23074da4dc76bf5e26d':
  vold: write bootloader message directly.

Change-Id: Ib8f63a49a86c0e9e7a231cb5d22f6bb9a14e820f
2016-04-09 01:09:55 +00:00
Yabin Cui
cbedcc30b3 Merge "vold: write bootloader message directly." into nyc-dev 2016-04-08 21:03:43 +00:00
Daichi Hirono
cb141e1b6a Add log flag for verbose AppFuse log for nyc-dev. am: 2d6555f
am: 4d5cfe5

* commit '4d5cfe57dd92ddfe8cf0ef78b096d669d7df6382':
  Add log flag for verbose AppFuse log for nyc-dev.

Change-Id: Idb2d16d6c265b191bff44e9c10f23375699d0933
2016-04-07 08:21:56 +00:00
Daichi Hirono
4d5cfe57dd Add log flag for verbose AppFuse log for nyc-dev.
am: 2d6555f

* commit '2d6555f33a5b0fd1e9f0db87e3a2146c3c26add0':
  Add log flag for verbose AppFuse log for nyc-dev.

Change-Id: I8a2325c0dfd70888e635994f8aa5901fbf57efac
2016-04-07 08:16:07 +00:00
Daichi Hirono
2d6555f33a Add log flag for verbose AppFuse log for nyc-dev.
Change-Id: I60ca596e32f8668ae5895e671d92c4978ede6314
Fixed: 28055420
2016-04-07 14:59:32 +09:00
Yabin Cui
ffa2e09921 vold: write bootloader message directly.
Bug: 27176738
Change-Id: I09bfe777e383325809d7ecc2dcb9129fe234053f
2016-04-06 17:21:38 -07:00
Mattias Nissler
dc80323969 Switch to BoringSSL crypto.
This replaces the libmincrypt dependency with libcrypto_utils, which
is needed due to libfec and fs_mgr switching to BoringSSL.

Change-Id: I4f6f4d8cc5e200679331a9bcdf2cc3bad1082dd6
2016-04-06 15:54:11 +02:00
Jeff Sharkey
452c56d360 Kill apps using PublicVolume when unmounting. am: 8aff854
am: f6b34cb

* commit 'f6b34cb9d1521a75b1f878e6f39717151de6b39d':
  Kill apps using PublicVolume when unmounting.

Change-Id: Ie3f4a11fe1f1d5daf48c4b6355c106bfb61b51b1
2016-03-31 03:50:13 +00:00
Jeff Sharkey
f6b34cb9d1 Kill apps using PublicVolume when unmounting.
am: 8aff854

* commit '8aff854b940039cce5fa2a227b19e39de6787b20':
  Kill apps using PublicVolume when unmounting.

Change-Id: I12332ee8d416eb2bba0f940a5f8bf64c5766c774
2016-03-31 03:47:49 +00:00
Jeff Sharkey
8aff854b94 Kill apps using PublicVolume when unmounting.
Bug: 24863778
Change-Id: I86a482c6de78afe2e09ca91165000e1b10a42058
2016-03-30 20:37:30 -06:00
Paul Crowley
2f0643158d Don\'t fail if the CE key isn\'t loaded in destroy_user_key am: 71ee662
am: 2761664

* commit '2761664e57974663722fdf6f4253add09cc31a9b':
  Don't fail if the CE key isn't loaded in destroy_user_key

Change-Id: I57c6333b4f7cdd45111e7353c6eba2f9fbbbca9f
2016-03-29 20:33:17 +00:00
Paul Crowley
2761664e57 Don\'t fail if the CE key isn\'t loaded in destroy_user_key
am: 71ee662

* commit '71ee662ec3f82db66f1a34579aff75cc27d4b205':
  Don't fail if the CE key isn't loaded in destroy_user_key

Change-Id: I7700f07dfa3421e57149aacf1a98b0a5eb8bf917
2016-03-29 20:30:13 +00:00
Paul Crowley
71ee662ec3 Don't fail if the CE key isn't loaded in destroy_user_key
Users don't have to be unlocked to be deleted, so don't worry if we
don't have their key to evict.

Bug: 26847403
Bug: 27441228
Change-Id: Ifd93f620926630aa102a3bb4a5d2d45d34f9b75d
2016-03-29 13:07:34 -07:00
Dan Austin
49ab5f9e6d Address const issues in preparation for libcxx rebase.
Change-Id: I5199c1eb4e874fd354beefa1232707949483e88d
2016-03-28 13:24:48 -07:00
Paul Crowley
1169ce2fd2 Support Keymaster2 with lots of clever template logic :) am: 0323afd
am: d4d7651

* commit 'd4d7651fc38d00c4a82bafac2f03d8d166a19d04':
  Support Keymaster2 with lots of clever template logic :)
2016-03-17 19:59:53 +00:00
Paul Crowley
d4d7651fc3 Support Keymaster2 with lots of clever template logic :)
am: 0323afd

* commit '0323afd69d82ce900d520f4611f56e6c06fc08a1':
  Support Keymaster2 with lots of clever template logic :)
2016-03-17 19:57:36 +00:00
Paul Crowley
0323afd69d Support Keymaster2 with lots of clever template logic :)
Bug: 27718275
Change-Id: I0b2aa74f45fd07a121ce0c342b27426a3fe593ce
2016-03-17 10:56:24 -07:00
Paul Lawrence
422a16ecdf Fix some static analyser issues am: 300dae7c38
am: a1b97135eb

* commit 'a1b97135ebf696bbac3bb0e5e477fe5fa467e20b':
  Fix some static analyser issues
2016-03-11 23:47:09 +00:00
Paul Lawrence
a1b97135eb Fix some static analyser issues
am: 300dae7c38

* commit '300dae7c38e6853148a998dfc1030b2be40490b5':
  Fix some static analyser issues
2016-03-11 23:45:29 +00:00
Paul Lawrence
300dae7c38 Fix some static analyser issues
Bug: 27099772
Change-Id: Ic96777edf4ea282be2b8f53525226396c01e023c
2016-03-11 11:02:52 -08:00
Hidehiko Abe
e6bd7850ff Merge "Split slave-bind mount into two." 2016-03-11 04:34:31 +00:00
Paul Lawrence
58ec71b9d4 Merge "Make sure encryption type is set on first boot" into nyc-dev am: 439034b8cc
am: dba928fabd

* commit 'dba928fabdd25b2834d6178c99a1c9557f89fa7c':
  Make sure encryption type is set on first boot
2016-03-11 01:53:43 +00:00
Paul Lawrence
dba928fabd Merge "Make sure encryption type is set on first boot" into nyc-dev
am: 439034b8cc

* commit '439034b8cc510a95d25c53c8606f88a40ddcbb0b':
  Make sure encryption type is set on first boot
2016-03-11 01:51:11 +00:00
Paul Lawrence
439034b8cc Merge "Make sure encryption type is set on first boot" into nyc-dev 2016-03-11 01:42:55 +00:00
Jeff Sharkey
53b9484734 Merge "Print size as unsigned when sending to framework." into nyc-dev am: f84fe90714
am: d6b13a70fb

* commit 'd6b13a70fbeaf32660c03f77d11c69124f2f914a':
  Print size as unsigned when sending to framework.
2016-03-11 00:22:07 +00:00
Jeff Sharkey
d6b13a70fb Merge "Print size as unsigned when sending to framework." into nyc-dev
am: f84fe90714

* commit 'f84fe907141bcdb76425d5ba42913576f018a11c':
  Print size as unsigned when sending to framework.
2016-03-11 00:19:11 +00:00