summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Merge "Close fd on error path in do_mount()"JP Abgrall2014-11-131-0/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Close fd on error path in do_mount()Tomasz Kondel2014-11-131-0/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix closes a file descriptor before returning error from do_mount() Change-Id: Ib370229f16bf9ac385162d6b163cc5b079a1e73e
* | | | | | Merge "Do not mount devices with invalid verity metadata"Sami Tolvanen2014-11-131-1/+3
|\ \ \ \ \ \
| * | | | | | Do not mount devices with invalid verity metadataSami Tolvanen2014-11-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Switch fs_mgr to use SHA-256 instead of SHA-1"Sami Tolvanen2014-11-131-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Switch fs_mgr to use SHA-256 instead of SHA-1Sami Tolvanen2014-11-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am 9b5b2d2c: am ca1797ae: Merge "Remove the stlport linked libbacktrace."Dan Albert2014-11-122-71/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | | * commit '9b5b2d2c23d85699d30c104e0ca9535dd21fe87d': Remove the stlport linked libbacktrace.
| * | | | | am ca1797ae: Merge "Remove the stlport linked libbacktrace."Dan Albert2014-11-122-71/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'ca1797ae00d3b5bf2eb4d1cad5bb68cef0074346': Remove the stlport linked libbacktrace.
| | * | | | Merge "Remove the stlport linked libbacktrace."Dan Albert2014-11-122-71/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Remove the stlport linked libbacktrace.Dan Albert2014-11-112-71/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the libc++ linked libbacktrace to the normal name. Bug: 15193147 Change-Id: I75caf1ee527e3703825e0db757497fb8fa3dd122
* | | | | | am 21d8d89c: am 06279285: Merge "Revert "Move some tests to libc++.""Dan Albert2014-11-122-3/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '21d8d89c7cda35ad1571375cf051c0b050604619': Revert "Move some tests to libc++."
| * | | | | am 06279285: Merge "Revert "Move some tests to libc++.""Dan Albert2014-11-122-3/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '06279285ae38b58988a9431c89b8689d8e16904e': Revert "Move some tests to libc++."
| | * | | | Merge "Revert "Move some tests to libc++.""Dan Albert2014-11-122-3/+2
| | |\ \ \ \
| | | * | | | Revert "Move some tests to libc++."Dan Albert2014-11-112-3/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 e3cccbfd4776644c7cb705d52f51ca948df34f9a.
* | | | | | am 4e472966: am 5c7e2e60: Merge "Move liblog tests and benchmarks to libc++."Dan Albert2014-11-122-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '4e4729668617ff1b45f88b15d8cbfecc3c0a1db2': Move liblog tests and benchmarks to libc++.
| * | | | | am 5c7e2e60: Merge "Move liblog tests and benchmarks to libc++."Dan Albert2014-11-122-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '5c7e2e603079c611b99302e5898b443440f2d9d7': Move liblog tests and benchmarks to libc++.
| | * | | | Merge "Move liblog tests and benchmarks to libc++."Dan Albert2014-11-122-1/+1
| | |\ \ \ \
| | | * | | | Move liblog tests and benchmarks to libc++.Dan Albert2014-11-122-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | Bug: 15193147 Change-Id: Ib063eb9490e40f9d10c0b0f29b7808c729e4fff9
* | | | | | am 498c8135: am 7d196df6: Merge "Move some tests to libc++."Dan Albert2014-11-122-2/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '498c8135b46b976806fb4e335071c11fc2c51776': Move some tests to libc++.
| * | | | | am 7d196df6: Merge "Move some tests to libc++."Dan Albert2014-11-122-2/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '7d196df6f9990b5c93e0661fb0867971da7e6c34': Move some tests to libc++.
| | * | | | Merge "Move some tests to libc++."Dan Albert2014-11-122-2/+3
| | |\ \ \ \
| | | * | | | Move some tests to libc++.Dan Albert2014-11-112-2/+3
| | | |/ / / | | | | | | | | | | | | | | | | | | Bug: 15193147 Change-Id: I93244e4a5d0c751056910ec8005a92401d305716
* | | | | | fs_mgr: let fsck.f2fs actually attempt a fix automerge: eb6036aJP Abgrall2014-11-121-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e90304c * commit 'e90304c8f14c9d644b8692c460f137c0c7850b69': fs_mgr: let fsck.f2fs actually attempt a fix
| * | | | | fs_mgr: let fsck.f2fs actually attempt a fixJP Abgrall2014-11-121-1/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: eb6036a * commit 'eb6036ac6be82dcc6e110de22574972631c8f83e': fs_mgr: let fsck.f2fs actually attempt a fix
| | * | | | fs_mgr: let fsck.f2fs actually attempt a fixJP Abgrall2014-11-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The newer fsck.f2fs (1.4.0++) has better fix support, so invoke it. Requires http://ag/583949 f2fs-tools update. Bug: 17640053 Bug: 18292088 Change-Id: I42370d92b232e0bdbf28cccf7035a15dbffeb268 Signed-off-by: JP Abgrall <jpa@google.com>
* | | | | | am 82831c3d: am 4b862563: Merge "property_service: Added vendor build ↵Daniel Rosenberg2014-11-111-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properties to load_all_props" * commit '82831c3d26e5b38bd24bbd241dac40e09fd9ba4b': property_service: Added vendor build properties to load_all_props
| * | | | | am 4b862563: Merge "property_service: Added vendor build properties to ↵Daniel Rosenberg2014-11-111-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | load_all_props" * commit '4b862563be2627864590be7dd071c1d0289a6f33': property_service: Added vendor build properties to load_all_props
| | * | | | Merge "property_service: Added vendor build properties to load_all_props"Daniel Rosenberg2014-11-111-0/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | property_service: Added vendor build properties to load_all_propsDaniel Rosenberg2014-11-111-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: I267bd848e1f6e2978024c07e603b25f1f41f5fbf Signed-off-by: Daniel Rosenberg <drosen@google.com>
* | | | | am 556f4382: am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP"Yabin Cui2014-11-112-14/+12
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | * commit '556f43820f90e78bbe8fc6f7dea6be865e975ab8': kill HAVE_POSIX_FILEMAP
| * | | am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP"Yabin Cui2014-11-112-14/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '2c0839e9dba6d9d282f8391c3edb14236f56618d': kill HAVE_POSIX_FILEMAP
| | * | Merge "kill HAVE_POSIX_FILEMAP"Yabin Cui2014-11-112-14/+12
| | |\ \
| | | * | kill HAVE_POSIX_FILEMAPYabin Cui2014-11-112-14/+12
| | |/ / | | | | | | | | | | | | | | | | Bug: 18315579 Change-Id: I0bd5fb946b12cb90e0c9c73a478df41609b8c3e2
* | | | am 62abd4c8: am b0d30271: Merge "Fix formatting in ↵Elliott Hughes2014-11-111-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 4df4dfedf6beef891d05d4e80704f5f4a594a885." * commit '62abd4c851c89ddc437af909791761cc3219ff00': Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885.
| * | | am b0d30271: Merge "Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885."Elliott Hughes2014-11-101-1/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'b0d30271699ecd48be791bbd002d2366b831a624': Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885.
| | * | Merge "Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885."Elliott Hughes2014-11-101-1/+2
| | |\ \
| | | * | Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885.Elliott Hughes2014-11-101-1/+2
| | |/ / | | | | | | | | | | | | Change-Id: I1ad219285cb1f4a39cfe2bdef224b78eff843317
* | | | am 496fc30d: am af2cd21d: Merge "When new error happend,then errno should be ↵Elliott Hughes2014-11-101-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 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.
| * | | am af2cd21d: Merge "When new error happend,then errno should be updated ↵Elliott Hughes2014-11-101-1/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | 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.
| | * | Merge "When new error happend,then errno should be updated accordingly. ↵Elliott Hughes2014-11-101-1/+2
| | |\ \ | | | | | | | | | | | | | | | Otherwise, need to keep previous errno."
| | | * | When new error happend,then errno should be updated accordingly.Bo Huang2014-11-101-1/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, need to keep previous errno. Reproduced steps: pre-condition: DUT support external SDcard or Usb mass storage; 1. Insert blank(no partition) SDcard or UMS to DUT; Expected result: Should prompt user with storage error. Test result: There is no notification for error. Error log: 01-01 01:06:49.239 I/fsck_msdos( 200): fsck_msdos terminated by exit(8) 01-01 01:06:49.239 E/Vold ( 200): /dev/block/vold/179:16 failed FS checks (I/O error) 01-01 01:06:49.239 D/Vold ( 200): Volume sdcard1 state changing 3 (Checking) -> 1 (Idle-Unmounted) 01-01 01:06:49.239 W/Vold ( 200): Returning OperationFailed - no handler for errno 0) Root cause analysis: 1.Volume::setState will call senBroadcase to send out state notification; 2.Finally, SocketClient::sendDataLockedv was called to sent message. In sendDataLockedv funtion, when current == iovcnt, e is 0 by default. So Vold get incorrect errno. Change-Id: Icb32a4193f02f22b5e3feaba177bc278f8f1f41b Signed-off-by: Bo Huang <bo.b.huang@intel.com>
* | | | am 25fb460a: am ae52248f: Merge "init isn\'t built for platforms without ↵Elliott Hughes2014-11-101-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | dirent::d_type." * commit '25fb460a03f25e3a68d4ecb5e3a35d366f772f62': init isn't built for platforms without dirent::d_type.
| * | | am ae52248f: Merge "init isn\'t built for platforms without dirent::d_type."Elliott Hughes2014-11-101-2/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'ae52248fa7ab12e1c3458aede101f143b1c76ead': init isn't built for platforms without dirent::d_type.
| | * | Merge "init isn't built for platforms without dirent::d_type."Elliott Hughes2014-11-101-2/+0
| | |\ \
| | | * | init isn't built for platforms without dirent::d_type.Elliott Hughes2014-11-101-2/+0
| | |/ / | | | | | | | | | | | | Change-Id: Icd4b431576f2ba619ff4ae6fb871bb0210d3b2f2
* | | | am b777eacc: am 1da681ca: Merge "bionic\'s struct stat is now POSIX-compliant."Elliott Hughes2014-11-101-6/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b777eacc871e246782ea61f51d87f75f9dc2bc15': bionic's struct stat is now POSIX-compliant.
| * | | am 1da681ca: Merge "bionic\'s struct stat is now POSIX-compliant."Elliott Hughes2014-11-101-6/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '1da681ca4d3d2b5973d364e80f7a5db47d1240c1': bionic's struct stat is now POSIX-compliant.
| | * | Merge "bionic's struct stat is now POSIX-compliant."Elliott Hughes2014-11-101-6/+6
| | |\ \
| | | * | bionic's struct stat is now POSIX-compliant.Elliott Hughes2014-11-101-6/+6
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now we still have the kernel names, but they're only there by "virtue" of macro namespace pollution, so I'd like to get rid of them. Bug: 18298106 Change-Id: Ifed0b3a9238c79a99d8a2b62e0f5897c50a725d1
* | | | am d6520cf9: am 65a83bdf: Merge "Reserve some AIDs for OEMs"Nick Kralevich2014-11-101-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd6520cf95869eb7d694f9d79abc47de1e2052d52': Reserve some AIDs for OEMs
generated by cgit v1.1 at 2025-02-04 19:10:00 +0000