Daichi Hirono
2d6555f33a
Add log flag for verbose AppFuse log for nyc-dev.
...
Change-Id: I60ca596e32f8668ae5895e671d92c4978ede6314
Fixed: 28055420
8 years ago
Yabin Cui
ffa2e09921
vold: write bootloader message directly.
...
Bug: 27176738
Change-Id: I09bfe777e383325809d7ecc2dcb9129fe234053f
8 years ago
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
8 years ago
Jeff Sharkey
452c56d360
Kill apps using PublicVolume when unmounting. am: 8aff854
...
am: f6b34cb
* commit 'f6b34cb9d1521a75b1f878e6f39717151de6b39d':
Kill apps using PublicVolume when unmounting.
Change-Id: Ie3f4a11fe1f1d5daf48c4b6355c106bfb61b51b1
8 years ago
Jeff Sharkey
f6b34cb9d1
Kill apps using PublicVolume when unmounting.
...
am: 8aff854
* commit '8aff854b940039cce5fa2a227b19e39de6787b20':
Kill apps using PublicVolume when unmounting.
Change-Id: I12332ee8d416eb2bba0f940a5f8bf64c5766c774
8 years ago
Jeff Sharkey
8aff854b94
Kill apps using PublicVolume when unmounting.
...
Bug: 24863778
Change-Id: I86a482c6de78afe2e09ca91165000e1b10a42058
8 years ago
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
8 years ago
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
8 years ago
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
8 years ago
Dan Austin
49ab5f9e6d
Address const issues in preparation for libcxx rebase.
...
Change-Id: I5199c1eb4e874fd354beefa1232707949483e88d
8 years ago
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 :)
8 years ago
Paul Crowley
d4d7651fc3
Support Keymaster2 with lots of clever template logic :)
...
am: 0323afd
* commit '0323afd69d82ce900d520f4611f56e6c06fc08a1':
Support Keymaster2 with lots of clever template logic :)
8 years ago
Paul Crowley
0323afd69d
Support Keymaster2 with lots of clever template logic :)
...
Bug: 27718275
Change-Id: I0b2aa74f45fd07a121ce0c342b27426a3fe593ce
8 years ago
Paul Lawrence
422a16ecdf
Fix some static analyser issues am: 300dae7c38
...
am: a1b97135eb
* commit 'a1b97135ebf696bbac3bb0e5e477fe5fa467e20b':
Fix some static analyser issues
8 years ago
Paul Lawrence
a1b97135eb
Fix some static analyser issues
...
am: 300dae7c38
* commit '300dae7c38e6853148a998dfc1030b2be40490b5':
Fix some static analyser issues
8 years ago
Paul Lawrence
300dae7c38
Fix some static analyser issues
...
Bug: 27099772
Change-Id: Ic96777edf4ea282be2b8f53525226396c01e023c
8 years ago
Hidehiko Abe
e6bd7850ff
Merge "Split slave-bind mount into two."
8 years ago
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
8 years ago
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
8 years ago
Paul Lawrence
439034b8cc
Merge "Make sure encryption type is set on first boot" into nyc-dev
8 years ago
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.
8 years ago
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.
8 years ago
Jeff Sharkey
f84fe90714
Merge "Print size as unsigned when sending to framework." into nyc-dev
8 years ago
Paul Lawrence
4ed4526e68
Make sure encryption type is set on first boot
...
Bug: 27599622
Change-Id: I2f38c03941ac8cdba40baf7421132f572866e296
8 years ago
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
8 years ago
Yu Ning
ca1179d97a
Merge "Support emulator\'s virtio-blk based SD card" into nyc-dev am: 828d386c7d
...
am: fcb71eba41
* commit 'fcb71eba418b161a6e5a46e5588e3eb64335648c':
Support emulator's virtio-blk based SD card
8 years ago
Yu Ning
fcb71eba41
Merge "Support emulator\'s virtio-blk based SD card" into nyc-dev
...
am: 828d386c7d
* commit '828d386c7de04c6f33c1e998fd9d4630f90d5be4':
Support emulator's virtio-blk based SD card
8 years ago
Prathmesh Prabhu
828d386c7d
Merge "Support emulator's virtio-blk based SD card" into nyc-dev
8 years ago
Daniel Rosenberg
200dae0f19
Merge "Add information to error message" into nyc-dev am: 19d76fda3a
...
am: 7945daa13c
* commit '7945daa13cbadb67f3503a12ccdd76c8ef134367':
Add information to error message
8 years ago
Daniel Rosenberg
7945daa13c
Merge "Add information to error message" into nyc-dev
...
am: 19d76fda3a
* commit '19d76fda3ada9bce91ac95110b10b6e075bc6726':
Add information to error message
8 years ago
Daniel Rosenberg
19d76fda3a
Merge "Add information to error message" into nyc-dev
8 years ago
Paul Crowley
c1a3ca29ed
Run clang-format over ext4crypt related code am: df528a7011
...
am: 1d348d29a3
* commit '1d348d29a30e24b15ea5c32774b92bc13e8041a7':
Run clang-format over ext4crypt related code
8 years ago
Paul Crowley
f98e6690c4
Use pointers not references for out arguments am: a051eb7a22
...
am: 41fb6ed048
* commit '41fb6ed0480f840f9d855f4e46ce4801e8373257':
Use pointers not references for out arguments
8 years ago
Paul Crowley
ee7a72bbd8
Require the auth token for decryption. am: 320e5e15b6
...
am: 64b60ccfcf
* commit '64b60ccfcfc37fd4b095f55f63d479459b1c06ea':
Require the auth token for decryption.
8 years ago
Paul Crowley
1d348d29a3
Run clang-format over ext4crypt related code
...
am: df528a7011
* commit 'df528a7011b302c91579898c4a37361214ab05bb':
Run clang-format over ext4crypt related code
8 years ago
Paul Crowley
41fb6ed048
Use pointers not references for out arguments
...
am: a051eb7a22
* commit 'a051eb7a22b7cd97e66d2f22b64884f8ebc73952':
Use pointers not references for out arguments
8 years ago
Paul Crowley
64b60ccfcf
Require the auth token for decryption.
...
am: 320e5e15b6
* commit '320e5e15b621da57a947adc896f7bb8357038bee':
Require the auth token for decryption.
8 years ago
Daniel Rosenberg
25a5213c1f
Add information to error message
...
Bug: 27452459
Change-Id: I89e813755da0946de4effd827799681df7e12d82
8 years ago
Paul Crowley
763d98aa14
Fix memory leak in generate_key wrapper. Other fixes. am: d9b9295b8c
...
am: b930c26c1f
* commit 'b930c26c1f15026aae411bb7575968bee4ed6d09':
Fix memory leak in generate_key wrapper. Other fixes.
8 years ago
Paul Crowley
b930c26c1f
Fix memory leak in generate_key wrapper. Other fixes.
...
am: d9b9295b8c
* commit 'd9b9295b8c2f17448f4eb3ea2c6f7d4a5c207c3f':
Fix memory leak in generate_key wrapper. Other fixes.
8 years ago
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
8 years ago
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
8 years ago
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
8 years ago
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
8 years ago
Paul Crowley
d9b9295b8c
Fix memory leak in generate_key wrapper. Other fixes.
...
- catch errors in looking for the keyring
- static_assert to prevent a buffer overrun
- remove obsolete, misleading comment
- dial down priority of some log messages
- explain why we ignore some errors
- idiomatic C++11
Bug: 27552432
Change-Id: Ic3ee05b41eae45e7c6b571a459b326a483663526
8 years ago
Yu Ning
942d4e830b
Support emulator's virtio-blk based SD card
...
Currently, vold only supports MMC (for SD cards) and SCSI (for USB
drives) devices. It does not recognize any device whose major number is
not one of those used by MMC and SCSI. Unfortunately, virtio-blk is one
such device. It is used by the new Android emulator (a.k.a. qemu2,
featuring the "ranchu" virtual board) for SD card emulation.
In order to make this virtio-blk based SD card device appear in Android
and appear as an SD card (rather than a USB drive), changes have to be
made to both vold (wherever the device major number is checked) and
ranchu's storage configuration. This CL implements former.
This is a stop-gap solution for emulator in nyc.
A longer term solution in-tune with upstream kernel is in the pipes.
Updated from aosp/master version.
BUG:27431753
Change-Id: I5014edec73be7c5b565d91542464c82cbe58992c
Signed-off-by: Yu Ning <yu.ning@intel.com>
(cherry picked from commit 5b1d1c7dfa13b4dca75213581dc8351b841b76c8)
8 years ago
George Burgess
972c545f7e
Merge "Cleanup uses of sprintf, add modes to open() with O_CREAT."
8 years ago
George Burgess IV
605d7ae18d
Cleanup uses of sprintf, add modes to open() with O_CREAT.
...
Change-Id: Iaed2538831b19ada26005bbef33cff28209c6512
8 years ago
Paul Crowley
b7f28dcb4b
Merge "Use a proper key length for the mode." into nyc-dev am: ad8e26297b
...
am: 2227b35945
* commit '2227b35945f8e5dcc30f05719d60cfae7fea5d18':
Use a proper key length for the mode.
8 years ago
Calin Juravle
23c51597ca
Prepare profile directories only for the internal storage am: d1ee944f08
...
am: c0c305fbcf
* commit 'c0c305fbcf0427aba9ddecb81015cdc0d4790dc1':
Prepare profile directories only for the internal storage
8 years ago