summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885.Elliott Hughes2014-11-101-1/+2
| | | | Change-Id: I1ad219285cb1f4a39cfe2bdef224b78eff843317
* 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>
* 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
* 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
* Merge "Reserve some AIDs for OEMs"Nick Kralevich2014-11-101-0/+5
|\
| * Reserve some AIDs for OEMsJohan Redestig2014-11-101-0/+5
| | | | | | | | | | | | | | OEMs frequently add some AIDs on their own. Reserve some range for them to use. Change-Id: I3c729c889c9bd3e105ae4f6fb0c04a42a10eb25c
* | Merge "Move winsock2.h in front of a potential windows.h include."Stephen Hines2014-11-091-0/+4
|\ \
| * | Move winsock2.h in front of a potential windows.h include.Stephen Hines2014-11-081-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Make Unicode.h use types that match libc++."Dan Albert2014-11-091-2/+2
|\ \
| * | Make Unicode.h use types that match libc++.Dan Albert2014-11-081-2/+2
| |/ | | | | | | | | | | | | 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
* | Merge "Remove dead code."Elliott Hughes2014-11-081-8/+0
|\ \ | |/ |/|
| * Remove dead code.Elliott Hughes2014-11-081-8/+0
|/ | | | | | __APPLE__ => HAVE_FUNOPEN. Change-Id: I191cccd9b75020ffbb3281283ce1f1b7abc15d22
* am 452f08a0: Merge "Add razer usb vid for future use with adb"Elliott Hughes2014-11-051-0/+3
|\ | | | | | | | | * commit '452f08a0b78e65cbd7e4cddac133e59f94d5db4c': Add razer usb vid for future use with adb
| * Merge "Add razer usb vid for future use with adb"Elliott Hughes2014-11-051-0/+3
| |\
| | * Add razer usb vid for future use with adbStuart Wells2014-11-031-0/+3
| | | | | | | | | | | | | | | Change-Id: I6b76c297de900da050473b764517cfd15c64b838 Signed-off-by: Stuart Wells <stuart.wells@razerzone.com>
* | | am 7a92d20e: Merge "Clean up some test makefiles."Dan Albert2014-11-054-44/+59
|\ \ \ | |/ / | | | | | | | | | * commit '7a92d20ec845c07472eaea7cf14fd0e69df836ef': Clean up some test makefiles.
| * | Merge "Clean up some test makefiles."Dan Albert2014-11-054-44/+59
| |\ \
| | * | Clean up some test makefiles.Dan Albert2014-11-044-44/+59
| |/ / | | | | | | | | | | | | | | | | | | Needed for building with libc++ as the default STL. Bug: 15193147 Change-Id: I8b462bd288fbea7e0ab182f85ffcbf438afb6aa4
* | | am a11ac455: Merge "Fix debuggerd issues."Christopher Ferris2014-11-035-63/+56
|\ \ \ | |/ / | | | | | | | | | * commit 'a11ac45536f0722becefccdb6b58378c5d9d0d4b': Fix debuggerd issues.
| * | Merge "Fix debuggerd issues."Christopher Ferris2014-11-035-63/+56
| |\ \ | | |/ | |/|
| | * Fix debuggerd issues.Christopher Ferris2014-11-035-63/+56
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix a problem where a tid exits before the attach completes, and it causes debuggerd to self terminate. - Fix a problem where sibling tid dumps do not properly wait for the tid to get signalled. Bug: 17800180 Bug: 12567315 (cherry picked from commit 84ddb34a3af77dbe490aaa07b738bbfd7109d5ba) Change-Id: I45e33865614d4c96f4a89cf117398666b556d500
* | resolved conflicts for merge of cb8c583d to stage-aosp-masterDmitriy Ivanov2014-11-031-1/+1
|\ \ | |/ | | | | Change-Id: I3a75fda571896ad42e5a2b9499e156e9449d23ed
| * Merge "Fix ps <process name>"Dmitriy Ivanov2014-11-031-1/+1
| |\
| | * Fix ps <process name>Dmitriy Ivanov2014-11-031-1/+1
| |/ | | | | | | | | | | | | | | Use /proc/pid/cmdline instead of /proc/pid/stat to filter process by name. Bug: 8638853 Change-Id: I469f55186e0d8b93311438cc8a1d0f73834f3fb5
* | am c6dead70: Merge "maybe fix mac build"Nick Kralevich2014-11-022-0/+2
|\ \ | |/ | | | | | | * commit 'c6dead707de7c03bd9759b61143dd33cb1435cbc': maybe fix mac build
| * Merge "maybe fix mac build"Nick Kralevich2014-11-022-0/+2
| |\
| | * maybe fix mac buildNick Kralevich2014-11-022-0/+2
| |/ | | | | | | | | | | | | system/core/libnativebridge/tests/CodeCacheExists_test.cpp:30:15: error: use of undeclared identifier 'ENOENT' ASSERT_EQ(ENOENT, errno); Change-Id: I188074b878a7ec3955a9f4b5dc7d1bfc56e2ccbc
* | am b968d5c8: Merge "Add shared library version of libziparchive."Ian Rogers2014-10-301-2/+15
|\ \ | |/ | | | | | | * commit 'b968d5c8468c9b0707f88f773fae16074e9018cf': Add shared library version of libziparchive.
| * Merge "Add shared library version of libziparchive."Ian Rogers2014-10-301-2/+15
| |\
| | * Add shared library version of libziparchive.Ian Rogers2014-10-301-2/+15
| |/ | | | | | | Change-Id: I9abded3bbff0e7976b1849c73e6978dd10ca84cd
* | am 91b76d7d: Merge "Made suffix length of rotated logcat files constant."Aristidis Papaioannou2014-10-292-2/+62
|\ \ | |/ | | | | | | * commit '91b76d7de3029f6e617d640ca1b9ef844fa44477': Made suffix length of rotated logcat files constant.
| * Merge "Made suffix length of rotated logcat files constant."Aristidis Papaioannou2014-10-292-2/+62
| |\
| | * Made suffix length of rotated logcat files constant.Aristidis Papaioannou2014-10-292-2/+62
| |/ | | | | | | | | | | | | | | | | The suffix now uses as many digits as needed to cover the maximum number of rotated files. eg, for 20 files it would use 2 digits: log_file.{01,02,03,...,20} Change-Id: I4709b3cf4bf88c209db3c4d9e24a3a4731c98bae
* | am 64989126: Merge "Add code cache tests to libnativebridge."Calin Juravle2014-10-295-1/+112
|\ \ | |/ | | | | | | * commit '649891267f3b0db1c6c37152fc570a4824d6aa39': Add code cache tests to libnativebridge.
| * Merge "Add code cache tests to libnativebridge."Calin Juravle2014-10-285-1/+112
| |\
| | * Add code cache tests to libnativebridge.Calin Juravle2014-10-285-1/+112
| | | | | | | | | | | | | | | Bug: 18027433 Change-Id: Ie5369c0d5bd147af412174dc0753d8a314196643
* | | am 8cf2ce10: Merge "Don\'t allow SUPPORTED_ABIs to be set by the native bridge."Narayan Kamath2014-10-281-43/+0
|\ \ \ | |/ / | | | | | | | | | * commit '8cf2ce1064847d5fed0ec728ef6e916e238767c0': Don't allow SUPPORTED_ABIs to be set by the native bridge.
| * | Merge "Don't allow SUPPORTED_ABIs to be set by the native bridge."Narayan Kamath2014-10-271-43/+0
| |\ \
| | * | Don't allow SUPPORTED_ABIs to be set by the native bridge.Narayan Kamath2014-10-221-43/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SUPPORTED_ABIs is a prioritized list of all ABIs a device support, and must not vary depending on whether or not an app is emulated. bug: 18061712 (cherry picked from commit 66f0d93c265657e17c7a1ddd74beb61070a8df69) Change-Id: I99cea3a56228dac43ae310c295881881e5a77c31
* | | | resolved conflicts for merge of e3c22c41 to stage-aosp-masterCalin Juravle2014-10-2811-47/+313
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I566aeb2e2de15813ee199d4635098029457fdf3d
| * | | Merge "Handle code_cache dir creation in libnativebridge"Calin Juravle2014-10-2711-46/+312
| |\ \ \ | | | |/ | | |/|
| | * | Handle code_cache dir creation in libnativebridgeCalin Juravle2014-10-2711-46/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - add kPreInitiliazed state to native bridge with check transition: kOpened->kPreInitialized->kInitialized - made sure we free the memory for the code_cache_path - tidy up some error messages - tidy up tests - add a dummy native bridge to test with Bug: 18027433 Bug: 18097480 Change-Id: I39f74c93580f2e224080dd3df2ffaa9cf9f8cd9c
* | | | am d88323b2: Merge "Add volatile to avoid clang optimization."Chih-Hung Hsieh2014-10-281-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd88323b2667c443c2738eb601eb0b9eaad1c3049': Add volatile to avoid clang optimization.
| * | | Merge "Add volatile to avoid clang optimization."Chih-Hung Hsieh2014-10-241-1/+1
| |\ \ \
| | * | | Add volatile to avoid clang optimization.Chih-Hung Hsieh2014-10-231-1/+1
| |/ / / | | | | | | | | | | | | | | | | BUG: 18108178 Change-Id: Ie5b8b1808fcf6d1eacc14a7c6ac0c8d49641fec2
* | | | am 5bea7edd: Merge "Fix type cast error, should be char* not void*."Chih-Hung Hsieh2014-10-281-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5bea7edddd1bca0f94b08f3fb7aefab1c3021e17': Fix type cast error, should be char* not void*.
| * | | Merge "Fix type cast error, should be char* not void*."Chih-Hung Hsieh2014-10-231-1/+1
| |\ \ \