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
2016-04-09 23:12:41 +00:00
Yabin Cui
008c7ddb1f
Merge "vold: write bootloader message directly." into nyc-dev
...
am: cbedcc3
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
2016-04-07 08:21:56 +00:00
Daichi Hirono
4d5cfe57dd
Add log flag for verbose AppFuse log for nyc-dev.
...
am: 2d6555f
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
2016-03-31 03:50:13 +00:00
Jeff Sharkey
f6b34cb9d1
Kill apps using PublicVolume when unmounting.
...
am: 8aff854
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
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
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
2016-03-17 19:59:53 +00:00
Paul Crowley
d4d7651fc3
Support Keymaster2 with lots of clever template logic :)
...
am: 0323afd
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
2016-03-11 23:47:09 +00:00
Paul Lawrence
a1b97135eb
Fix some static analyser issues
...
am: 300dae7c38
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
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
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
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
2016-03-11 00:19:11 +00:00
Jeff Sharkey
f84fe90714
Merge "Print size as unsigned when sending to framework." into nyc-dev
2016-03-11 00:07:25 +00:00
Paul Lawrence
4ed4526e68
Make sure encryption type is set on first boot
...
Bug: 27599622
Change-Id: I2f38c03941ac8cdba40baf7421132f572866e296
2016-03-10 15:44:21 -08:00
Jeff Sharkey
d087bbc66f
Print size as unsigned when sending to framework.
...
Otherwise we might output negative numbers that confuse the rest
of the recovery stack.
Bug: 26007445
Change-Id: Ic99b49360732e5389c6330be065e1222e25b60ca
2016-03-10 12:11:20 -07:00
Yu Ning
ca1179d97a
Merge "Support emulator\'s virtio-blk based SD card" into nyc-dev am: 828d386c7d
...
am: fcb71eba41
2016-03-10 17:18:57 +00:00
Yu Ning
fcb71eba41
Merge "Support emulator\'s virtio-blk based SD card" into nyc-dev
...
am: 828d386c7d
2016-03-10 17:16:57 +00:00
Prathmesh Prabhu
828d386c7d
Merge "Support emulator's virtio-blk based SD card" into nyc-dev
2016-03-10 17:12:59 +00:00
Daniel Rosenberg
200dae0f19
Merge "Add information to error message" into nyc-dev am: 19d76fda3a
...
am: 7945daa13c
2016-03-10 00:07:50 +00:00
Daniel Rosenberg
7945daa13c
Merge "Add information to error message" into nyc-dev
...
am: 19d76fda3a
2016-03-10 00:05:52 +00:00
Daniel Rosenberg
19d76fda3a
Merge "Add information to error message" into nyc-dev
2016-03-09 23:58:12 +00:00
Paul Crowley
c1a3ca29ed
Run clang-format over ext4crypt related code am: df528a7011
...
am: 1d348d29a3
2016-03-09 22:15:00 +00:00
Paul Crowley
f98e6690c4
Use pointers not references for out arguments am: a051eb7a22
...
am: 41fb6ed048
2016-03-09 22:15:00 +00:00
Paul Crowley
ee7a72bbd8
Require the auth token for decryption. am: 320e5e15b6
...
am: 64b60ccfcf
2016-03-09 22:15:00 +00:00
Paul Crowley
1d348d29a3
Run clang-format over ext4crypt related code
...
am: df528a7011
2016-03-09 22:11:05 +00:00
Paul Crowley
41fb6ed048
Use pointers not references for out arguments
...
am: a051eb7a22
2016-03-09 22:11:05 +00:00
Paul Crowley
64b60ccfcf
Require the auth token for decryption.
...
am: 320e5e15b6
2016-03-09 22:11:05 +00:00
Daniel Rosenberg
25a5213c1f
Add information to error message
...
Bug: 27452459
Change-Id: I89e813755da0946de4effd827799681df7e12d82
2016-03-09 13:53:39 -08:00
Paul Crowley
763d98aa14
Fix memory leak in generate_key wrapper. Other fixes. am: d9b9295b8c
...
am: b930c26c1f
2016-03-09 19:27:57 +00:00
Paul Crowley
b930c26c1f
Fix memory leak in generate_key wrapper. Other fixes.
...
am: d9b9295b8c
2016-03-09 19:26:02 +00:00
Paul Crowley
df528a7011
Run clang-format over ext4crypt related code
...
The formatting here is inconsistent with Android house style; use
clang-format to bring it back into line.
Change-Id: Id1fe6ff54e9b668ca88c3fc021ae0a5bdd1327eb
2016-03-09 09:34:13 -08:00
Paul Crowley
a051eb7a22
Use pointers not references for out arguments
...
Google/Android C++ style requires that arguments passed in for writing
should be pointers, not references, so that it's visible in the caller
that they'll be written to.
Bug: 27566014
Change-Id: I5cd55906cc4b2f61c8b97b223786be0b3ce28862
2016-03-09 09:32:02 -08:00
Hidehiko Abe
674bed18bd
Split slave-bind mount into two.
...
mount(2) does not work with MS_BIND | MS_SLAVE at a time.
Instead, this CL calls mount twice.
Change-Id: I072fd5377e35fff5ed3fa2798eea084d86fe2977
2016-03-09 16:42:10 +09:00
Paul Crowley
320e5e15b6
Require the auth token for decryption.
...
A bug meant that the auth token wasn't being used; it turns out that
in order to use it we need to do things slightly differently.
Bug: 27496553
Change-Id: I0f0ab77fed31b92a79eba4acf488cb098691b4be
2016-03-08 14:32:00 -08:00
