ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11499 commits 1 branch 0 tags 217 MiB
Commit graph

11499 commits

This branch
This branch
All branches
Author SHA1 Message Date
Elliott Hughes
0bf7a90564 am 8822a81d: am a78e1a74: Merge "Sdcard: Initialize the padding output value" 
* commit '8822a81defc3224c11e44719baf5574202142a05':
  Sdcard: Initialize the padding output value
 2014-11-14 18:55:03 +00:00
Yabin Cui
88749eec0a am 5a8a0162: am 8f7fc8df: Merge "kill HAVE_LOCALTIME_R" 
* commit '5a8a016287db75c9599bc0b95a925364c6000025':
  kill HAVE_LOCALTIME_R
 2014-11-14 00:47:27 +00:00
JP Abgrall
4ad65befd1 am d707b7f9: am b0a10b53: Merge "Fix segfault in get_character_device_symlinks()" 
* commit 'd707b7f99357b521e01c0b11489a3b17b04a2a2d':
  Fix segfault in get_character_device_symlinks()
 2014-11-14 00:47:18 +00:00
JP Abgrall
08807417a7 am 755b9099: am c325535d: Merge "Close fd on error path in do_mount()" 
* commit '755b9099203fd1b491bf82dc8dad5bafba4f6bcd':
  Close fd on error path in do_mount()
 2014-11-14 00:47:17 +00:00
Elliott Hughes
8822a81def am a78e1a74: Merge "Sdcard: Initialize the padding output value" 
* commit 'a78e1a741810bbeaea955f30e6b5b8aa6b4b3a6b':
  Sdcard: Initialize the padding output value
 2014-11-13 20:31:22 +00:00
Elliott Hughes
a78e1a7418 Merge "Sdcard: Initialize the padding output value" 2014-11-13 20:21:05 +00:00
Yabin Cui
5a8a016287 am 8f7fc8df: Merge "kill HAVE_LOCALTIME_R" 
* commit '8f7fc8dfed9ab6615e4a906aaefdf0eadd31ea28':
  kill HAVE_LOCALTIME_R
 2014-11-13 19:17:59 +00:00
JP Abgrall
d707b7f993 am b0a10b53: Merge "Fix segfault in get_character_device_symlinks()" 
* commit 'b0a10b53eeeef6428bd034e3097391e9a7a4788b':
  Fix segfault in get_character_device_symlinks()
 2014-11-13 19:10:18 +00:00
JP Abgrall
755b909920 am c325535d: Merge "Close fd on error path in do_mount()" 
* commit 'c325535d3de1d103d5d40c5267df9ff9325bb3e3':
  Close fd on error path in do_mount()
 2014-11-13 19:10:16 +00:00
Yabin Cui
8f7fc8dfed Merge "kill HAVE_LOCALTIME_R" 2014-11-13 19:08:51 +00:00
JP Abgrall
b0a10b53ee Merge "Fix segfault in get_character_device_symlinks()" 2014-11-13 18:24:07 +00:00
Tomasz Kondel
fca58f4b18 Fix segfault in get_character_device_symlinks() 
A segmentation fault will occur when strchr function returns NULL.

Change-Id: I76076acfff16056179bf24dff5df9f81d9a45125
 2014-11-13 18:23:34 +00:00
JP Abgrall
c325535d3d Merge "Close fd on error path in do_mount()" 2014-11-13 18:21:25 +00:00
Tomasz Kondel
bfdcc40bff Close fd on error path in do_mount() 
This fix closes a file descriptor before returning
error from do_mount()

Change-Id: Ib370229f16bf9ac385162d6b163cc5b079a1e73e
 2014-11-13 18:20:55 +00:00
Yabin Cui
8a98535bcb kill HAVE_LOCALTIME_R 
Bug: 18361583
Change-Id: Icdc745a5204bba26c6438d16ed38ec791e136163
 2014-11-13 10:11:23 -08:00
Sami Tolvanen
3e5319734c Merge "Do not mount devices with invalid verity metadata" 2014-11-13 17:13:48 +00:00
Sami Tolvanen
2028b97788 Merge "Switch fs_mgr to use SHA-256 instead of SHA-1" 2014-11-13 17:13:41 +00:00
Daisuke Okitsu
19ec8860c1 Sdcard: Initialize the padding output value 
Add initialization of the output value in handle_write.
This value is referred to in FUSE so initialization is
necessary.

See also handle_open and handle_opendir.

Change-Id: I6507f113da9f6823fbfa459624d6594fc20afa51
 2014-11-13 10:51:07 +01:00
Dan Albert
d2d55d6906 am 9b5b2d2c: am ca1797ae: Merge "Remove the stlport linked libbacktrace." 
* commit '9b5b2d2c23d85699d30c104e0ca9535dd21fe87d':
  Remove the stlport linked libbacktrace.
 2014-11-12 22:27:56 +00:00
Dan Albert
9b5b2d2c23 am ca1797ae: Merge "Remove the stlport linked libbacktrace." 
* commit 'ca1797ae00d3b5bf2eb4d1cad5bb68cef0074346':
  Remove the stlport linked libbacktrace.
 2014-11-12 22:21:47 +00:00
Dan Albert
ca1797ae00 Merge "Remove the stlport linked libbacktrace." 2014-11-12 22:12:34 +00:00
Dan Albert
c7c75cd483 am 21d8d89c: am 06279285: Merge "Revert "Move some tests to libc++."" 
* commit '21d8d89c7cda35ad1571375cf051c0b050604619':
  Revert "Move some tests to libc++."
 2014-11-12 16:37:16 +00:00
Dan Albert
ff0079fc8f am 4e472966: am 5c7e2e60: Merge "Move liblog tests and benchmarks to libc++." 
* commit '4e4729668617ff1b45f88b15d8cbfecc3c0a1db2':
  Move liblog tests and benchmarks to libc++.
 2014-11-12 16:36:52 +00:00
Dan Albert
21d8d89c7c am 06279285: Merge "Revert "Move some tests to libc++."" 
* commit '06279285ae38b58988a9431c89b8689d8e16904e':
  Revert "Move some tests to libc++."
 2014-11-12 05:50:56 +00:00
Dan Albert
06279285ae Merge "Revert "Move some tests to libc++."" 2014-11-12 05:43:55 +00:00
Dan Albert
1d3b492bde Revert "Move some tests to libc++." 
The build system is still linking both libgcc and libcompiler-rt,
which is causing duplicate symbol errors on some architectures. This
requires a fix in the build system, so reverting for now.

This reverts commit e3cccbfd47.
 2014-11-11 21:42:27 -08:00
Dan Albert
4e47296686 am 5c7e2e60: Merge "Move liblog tests and benchmarks to libc++." 
* commit '5c7e2e603079c611b99302e5898b443440f2d9d7':
  Move liblog tests and benchmarks to libc++.
 2014-11-12 03:54:34 +00:00
Dan Albert
5c7e2e6030 Merge "Move liblog tests and benchmarks to libc++." 2014-11-12 03:44:42 +00:00
Dan Albert
f2dedb7a5f Move liblog tests and benchmarks to libc++. 
Bug: 15193147
Change-Id: Ib063eb9490e40f9d10c0b0f29b7808c729e4fff9
 2014-11-12 03:44:16 +00:00
Dan Albert
e924cced8e am 498c8135: am 7d196df6: Merge "Move some tests to libc++." 
* commit '498c8135b46b976806fb4e335071c11fc2c51776':
  Move some tests to libc++.
 2014-11-12 03:43:52 +00:00
Dan Albert
498c8135b4 am 7d196df6: Merge "Move some tests to libc++." 
* commit '7d196df6f9990b5c93e0661fb0867971da7e6c34':
  Move some tests to libc++.
 2014-11-12 02:52:59 +00:00
JP Abgrall
c3939f08da fs_mgr: let fsck.f2fs actually attempt a fix automerge: eb6036a 
automerge: e90304c

* commit 'e90304c8f14c9d644b8692c460f137c0c7850b69':
  fs_mgr: let fsck.f2fs actually attempt a fix
 2014-11-12 01:59:11 +00:00
Dan Albert
7d196df6f9 Merge "Move some tests to libc++." 2014-11-12 01:53:28 +00:00
JP Abgrall
e90304c8f1 fs_mgr: let fsck.f2fs actually attempt a fix 
automerge: eb6036a

* commit 'eb6036ac6be82dcc6e110de22574972631c8f83e':
  fs_mgr: let fsck.f2fs actually attempt a fix
 2014-11-12 00:19:54 +00:00
Dan Albert
e3cccbfd47 Move some tests to libc++. 
Bug: 15193147
Change-Id: I93244e4a5d0c751056910ec8005a92401d305716
 2014-11-11 23:59:02 +00:00
Dan Albert
0d7164d4dd Remove the stlport linked libbacktrace. 
Rename the libc++ linked libbacktrace to the normal name.

Bug: 15193147
Change-Id: I75caf1ee527e3703825e0db757497fb8fa3dd122
 2014-11-11 15:57:38 -08:00
Daniel Rosenberg
9eb0ef6f40 am 82831c3d: am 4b862563: Merge "property_service: Added vendor build properties to load_all_props" 
* commit '82831c3d26e5b38bd24bbd241dac40e09fd9ba4b':
  property_service: Added vendor build properties to load_all_props
 2014-11-11 22:52:07 +00:00
Daniel Rosenberg
82831c3d26 am 4b862563: Merge "property_service: Added vendor build properties to load_all_props" 
* commit '4b862563be2627864590be7dd071c1d0289a6f33':
  property_service: Added vendor build properties to load_all_props
 2014-11-11 22:47:04 +00:00
Daniel Rosenberg
4b862563be Merge "property_service: Added vendor build properties to load_all_props" 2014-11-11 20:39:58 +00:00
Daniel Rosenberg
b95122205d property_service: Added vendor build properties to load_all_props 
Change-Id: I267bd848e1f6e2978024c07e603b25f1f41f5fbf
Signed-off-by: Daniel Rosenberg <drosen@google.com>
 2014-11-11 12:17:00 -08:00
Yabin Cui
d94793afb1 am 556f4382: am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP" 
* commit '556f43820f90e78bbe8fc6f7dea6be865e975ab8':
  kill HAVE_POSIX_FILEMAP
 2014-11-11 19:57:14 +00:00
Yabin Cui
556f43820f am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP" 
* commit '2c0839e9dba6d9d282f8391c3edb14236f56618d':
  kill HAVE_POSIX_FILEMAP
 2014-11-11 19:53:38 +00:00
Yabin Cui
2c0839e9db Merge "kill HAVE_POSIX_FILEMAP" 2014-11-11 19:24:20 +00:00
Yabin Cui
266092c52d kill HAVE_POSIX_FILEMAP 
Bug: 18315579
Change-Id: I0bd5fb946b12cb90e0c9c73a478df41609b8c3e2
 2014-11-11 10:31:30 -08:00
Sami Tolvanen
c95e9da396 Do not mount devices with invalid verity metadata 
The return value of read_verity_metadata is propagated to caller
even if the verity metadata is invalid, provided that it can be
read from the device. This results in devices with invalid verity
metadata signatures to be mounted normally, which is not desirable.
This change fixes the bug by changing the return value in case of
verification failure to FS_MGR_SETUP_VERITY_FAIL.

Change-Id: Ic29f37a23cb417c2538d60fb05de9dd310d50f4a
 2014-11-11 07:27:18 -08:00
Sami Tolvanen
a3465e250c Switch fs_mgr to use SHA-256 instead of SHA-1 
Verity metadata signatures will be switched to SHA-256. Switch
fs_mgr signature verification to use the correct algorithm.

Needs matching changes from
  https://googleplex-android-review.git.corp.google.com/#/c/579905/
  https://googleplex-android-review.git.corp.google.com/#/c/583213/
  https://googleplex-android-review.git.corp.google.com/#/c/583214/
  https://googleplex-android-review.git.corp.google.com/#/c/583233/

Bug: 17917515
Change-Id: I8f90519bffa105a0eb7abeaad3aea1ffceb851e2
 2014-11-11 07:26:56 -08:00
Elliott Hughes
35c265a35a am 62abd4c8: am b0d30271: Merge "Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885." 
* commit '62abd4c851c89ddc437af909791761cc3219ff00':
  Fix formatting in 4df4dfedf6.
 2014-11-11 00:04:55 +00:00
Elliott Hughes
4dc88ea387 am 496fc30d: am af2cd21d: Merge "When new error happend,then errno should be updated accordingly. Otherwise, need to keep previous errno." 
* commit '496fc30d9988ff8de8eefc575cb8c8335ec8cf8e':
  When new error happend,then errno should be updated accordingly. Otherwise, need to keep previous errno.
 2014-11-10 23:59:53 +00:00
Elliott Hughes
62abd4c851 am b0d30271: Merge "Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885." 
* commit 'b0d30271699ecd48be791bbd002d2366b831a624':
  Fix formatting in 4df4dfedf6.
 2014-11-10 23:59:10 +00:00
Elliott Hughes
496fc30d99 am af2cd21d: Merge "When new error happend,then errno should be updated accordingly. Otherwise, need to keep previous errno." 
* commit 'af2cd21d00f16f4915a40004bdbdc2603e958f5a':
  When new error happend,then errno should be updated accordingly. Otherwise, need to keep previous errno.
 2014-11-10 23:54:18 +00:00