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

11146 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
498c8135b4 am 7d196df6: Merge "Move some tests to libc++." 
* commit '7d196df6f9990b5c93e0661fb0867971da7e6c34':
  Move some tests to libc++.
 2014-11-12 02:52:59 +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
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
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
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
Elliott Hughes
b0d3027169 Merge "Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885." 2014-11-10 23:51:15 +00:00
Elliott Hughes
f6b62d0a7d Fix formatting in 4df4dfedf6. 
Change-Id: I1ad219285cb1f4a39cfe2bdef224b78eff843317
 2014-11-10 15:50:30 -08:00
Elliott Hughes
af2cd21d00 Merge "When new error happend,then errno should be updated accordingly. Otherwise, need to keep previous errno." 2014-11-10 23:45:50 +00:00
Bo Huang
4df4dfedf6 When new error happend,then errno should be updated accordingly. 
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>
 2014-11-10 15:45:16 -08:00
Elliott Hughes
25fb460a03 am ae52248f: Merge "init isn\'t built for platforms without dirent::d_type." 
* commit 'ae52248fa7ab12e1c3458aede101f143b1c76ead':
  init isn't built for platforms without dirent::d_type.
 2014-11-10 23:31:07 +00:00
Elliott Hughes
ae52248fa7 Merge "init isn't built for platforms without dirent::d_type." 2014-11-10 23:20:14 +00:00
Elliott Hughes
57583a789f init isn't built for platforms without dirent::d_type. 
Change-Id: Icd4b431576f2ba619ff4ae6fb871bb0210d3b2f2
 2014-11-10 15:00:00 -08:00
Elliott Hughes
b777eacc87 am 1da681ca: Merge "bionic\'s struct stat is now POSIX-compliant." 
* commit '1da681ca4d3d2b5973d364e80f7a5db47d1240c1':
  bionic's struct stat is now POSIX-compliant.
 2014-11-10 22:14:42 +00:00
Elliott Hughes
1da681ca4d Merge "bionic's struct stat is now POSIX-compliant." 2014-11-10 19:07:15 +00:00
Elliott Hughes
f1df854e58 bionic's struct stat is now POSIX-compliant. 
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
 2014-11-10 11:03:38 -08:00
Nick Kralevich
d6520cf958 am 65a83bdf: Merge "Reserve some AIDs for OEMs" 
* commit '65a83bdf2ea1643449294a23a450e5a8a5b5058c':
  Reserve some AIDs for OEMs
 2014-11-10 17:51:34 +00:00
Nick Kralevich
65a83bdf2e Merge "Reserve some AIDs for OEMs" 2014-11-10 17:42:58 +00:00
Johan Redestig
60ac6364ec Reserve some AIDs for OEMs 
OEMs frequently add some AIDs on their own. Reserve some range
for them to use.

Change-Id: I3c729c889c9bd3e105ae4f6fb0c04a42a10eb25c
 2014-11-10 08:14:21 +01:00
Stephen Hines
96031a9985 am f02c7972: Merge "Move winsock2.h in front of a potential windows.h include." 
* commit 'f02c7972560bc512552830c8110d026136a3a87f':
  Move winsock2.h in front of a potential windows.h include.
 2014-11-09 09:03:31 +00:00
Dan Albert
7c7a782cad am aaa920d7: Merge "Make Unicode.h use types that match libc++." 
* commit 'aaa920d7969d9dd4b9e7871f2758d9092095bead':
  Make Unicode.h use types that match libc++.
 2014-11-09 09:03:30 +00:00
Stephen Hines
f02c797256 Merge "Move winsock2.h in front of a potential windows.h include." 2014-11-09 07:24:43 +00:00
Stephen Hines
7e34121e39 Move winsock2.h in front of a potential windows.h include. 
Files that included FileMap.h (possibly transitively), before including
ByteOrder.h (which pulls in winsock2.h directly), will experience a
compiler warning/error from the latest mingw headers. This happens because
the headers require that winsock2.h come before windows.h in all cases.
The simplest (and most error-proof) fix for now is to include winsock2.h
before this use of windows.h.

Change-Id: I33069e4c9962d9820d0ea5976554f89d7ff6307c
 2014-11-08 19:30:05 -08:00
Dan Albert
aaa920d796 Merge "Make Unicode.h use types that match libc++." 2014-11-09 02:09:35 +00:00
Dan Albert
2f5ad5ff86 Make Unicode.h use types that match libc++. 
libc++ also defines these types for pre-C++11, and the two definitions
need to match to avoid redefinition errors.

Bug: 18300613
Change-Id: I1e9198d39f7c470f37bc6edba2dca2d499f54c9b
 2014-11-08 20:22:30 +00:00
Elliott Hughes
aeac9cd1b3 am 85507404: Merge "Remove dead code." 
* commit '855074043144e74156972e7a3416808dc6696452':
  Remove dead code.
 2014-11-08 20:11:53 +00:00
Elliott Hughes
8550740431 Merge "Remove dead code." 2014-11-08 20:05:34 +00:00
Elliott Hughes
9a092dd373 Remove dead code. 
__APPLE__ => HAVE_FUNOPEN.

Change-Id: I191cccd9b75020ffbb3281283ce1f1b7abc15d22
 2014-11-08 11:32:07 -08:00
JP Abgrall
eb6036ac6b fs_mgr: let fsck.f2fs actually attempt a fix 
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>
 2014-11-08 01:20:24 +00:00
Christopher Ferris
419807a3d3 am 0eabf64c: Fix adb/fastboot windows compilations. 
* commit '0eabf64ce0c649e4ef691ae1b70cb20d599dd429':
  Fix adb/fastboot windows compilations.
 2014-11-07 04:04:07 +00:00
Christopher Ferris
0eabf64ce0 Fix adb/fastboot windows compilations. 
Many of the windows files where not including stdlib.h even though they
are using malloc/free calls.

Bug: 18283958
(cherry picked from commit ae7bf0959b)

Change-Id: Iebc09cc314fa8f0ba6c6cd45ba26135052f156dd
 2014-11-06 18:32:39 -08:00
Christopher Ferris
ae7bf0959b Fix adb/fastboot windows compilations. 
Many of the windows files where not including stdlib.h even though they
are using malloc/free calls.

Change-Id: If6959df9909d9d9928e9f4a2a96018166361cf3c
 2014-11-06 14:34:24 -08:00