commit dcd730231a7d10f12ba412f9765e5a1bff5ccfc5 Author: Christopher Ferris Date: Mon Jul 15 13:55:45 2013 -0700 Fix assembler errors in generic arm strlen.c. Tested using a static version of the strlen libc_test program on a nexus7 that uses the generic code. Merge from internal master. (cherry-picked from d8d10a8994472e40d19301b7087806630877b4d5) Change-Id: I88f7dc01dc5b5c3ac2d5580d92153bc1bc36c564 commit dd2150b68a0e00d130bcf9b3b4af68a93971ae00 Author: Christopher Ferris Date: Mon Jul 15 12:49:26 2013 -0700 libc: Optimize strcat/strcpy, small tweaks to strlen Create one version of strcat/strcpy/strlen for cortex-a15/krait/scorpion and another version for cortex-a9. Tested with the libc_test strcat/strcpy/strlen tests. Including new tests that verify that the src for strcat/strcpy do not overread across page boundaries. NOTE: The handling of unaligned strcpy (same code in strcat) could probably be optimized further such that the src is read 64 bits at a time instead of the partial reads occurring now. strlen improves slightly since it was recently optimized. Performance improvements for strcpy and strcat (using an empty dest string): cortex-a9 - Small copies vary from about 5% to 20% as the size gets above 10 bytes. - Copies >= 1024, about a 60% improvement. - Unaligned copies, from about 40% improvement. cortex-a15 - Most small copies exhibit a 100% improvement, a few copies only improve by 20%. - Copies >= 1024, about 150% improvement. - Unaligned copies, about 100% improvement. krait - Most small copies vary widely, but on average 20% improvement, then the performance gets better, hitting about a 100% improvement when copies 64 bytes of data. - Copies >= 1024, about 100% improvement. - When coping MBs of data, about 50% improvement. - Unaligned copies, about 90% improvement. As strcat destination strings get larger in size: cortex-a9 - about 40% improvement for small dst strings (>= 32). - about 250% improvement for dst strings >= 1024. cortex-a15 - about 200% improvement for small dst strings (>=32). - about 250% improvement for dst strings >= 1024. krait - about 25% improvement for small dst strings (>=32). - about 100% improvement for dst strings >=1024. Merge from internal master. (cherry-picked from d119b7b6f48fe507088cfb98bcafa99b320fd884) Change-Id: I296463b251ef9fab004ee4dded2793feca5b547a Conflicts: libc/Android.mk libc/arch-arm/generic/generic.mk libc/arch-arm/krait/krait.mk Fix strcpy.c that should have been strcpy.S Merge from internal master. (cherry-picked from 1ce665416307628f4bcaced86faa64bdf9c489c3) Conflicts: libc/arch-arm/generic/generic.mk Change-Id: I376b831df42248baadde7202a30a68112f752ff7 commit e19f1d8db8d6007318884272b4b04fcc97bab76f Author: Koushik Dutta Date: Tue Aug 13 14:51:31 2013 -0700 v6036 Change-Id: I7e70d0e2e367f703fe420d4300eb5fecdc247099 commit 0c328c787c2eb6d2d3091710c588869f666ae332 Author: Koushik Dutta Date: Tue Aug 13 14:50:46 2013 -0700 Shrink cid Change-Id: I00556341b746f186f424ebe46c94fd02f10e6536 commit 933c57dfe7ac7f86729c5df6171141b7e74faedd Author: Ricardo Cerqueira Date: Tue Aug 13 20:13:14 2013 +0100 Updated CM release key for recovery Change-Id: I4aad710101cb6fbbd9df2a3137f9a5ae0e0432da commit bc463b5f2745d1711e6fa3de73413652abf69ec2 Author: Nick Kralevich Date: Fri Jul 12 13:49:49 2013 -0700 goldfish: use fstab.goldfish Don't rely on init.rc to mount our filesystems for us. Do it ourselves from fstab.goldfish. Change-Id: I80ba51f34e8d34b24bc7b14f527ac507d2d819e1 commit 4615de63ea7d346198107c2b1e78b3f542297a9a Merge: 11062bd d81b3aa Author: Ricardo Cerqueira Date: Tue Aug 13 15:43:23 2013 +0100 Merge branch 'jb-mr2-release' of https://android.googlesource.com/device/lge/mako into cm-10.2 commit d1e3a1bc3a01e363dd4f61fbb8706bc29c2e99f5 Merge: 8039d6b c971f22 Author: Ricardo Cerqueira Date: Tue Aug 13 22:36:01 2013 +0000 Merge "Fix ordering of home keypress handling" into cm-10.2 commit c971f2218620ecc789692138b80bd28e05d3d395 Author: Ethan Chen Date: Tue Aug 13 14:38:59 2013 -0700 Fix ordering of home keypress handling * Home keypress handling was done out of order, causing an extra go home action to be executed. Change-Id: Ieb2f6ffbf6d1e18a5d4602975f48717089e5c9dc commit 8039d6b2bf1316670bea1d0440ddc5e6409cd88d Author: Danny Baumann Date: Wed Aug 7 12:41:00 2013 +0200 Improve resolver layout in case package name is shown. Change-Id: Ib2bd0c19727194205b6e4114c34bf96663030d5f commit 5294630b5efadb96c4e87150765e8f8b2c7c4fc7 Author: Rajshekar Eashwarappa Date: Wed Jul 31 12:45:34 2013 +0530 webkit: Manage video playing state properly when browser goes to background Issue: Browser App Video streaming not pausing while pressing home Button Fix : When the Browser goes to the background while the video is playing in the fullscreen, the fullscreen mode is exited. While exiting the full screen mode the video state is handled properly. So that there is no playback in the background. CRs-Fixed: 509225 Change-Id: I32c306923d2638731d34d216cf006050ce4ad825 commit 903eee459536779620337b570d94f37f8d74073a Author: huiy Date: Thu Jul 18 19:23:32 2013 +0800 Add 2 APIs (suspend and resume) in MediaPlayer - API:suspend() will just pause the player and release all the decoders - instead of release the whole player - API:resume() will just init the decoders again - Add a check in onVideoEvent() - to make sure the first seek operation will seek the next i-frame Change-Id: Ia4716f7fb3a412eb19c6ded9c0f3056d0490546c Implement the suspend/resume operation in VideoView - Using the new APIs in Mediaplayer to implement the suspend/resume operation in VideoView - Add a new status "SUSPENDED" Change-Id: I00f9daa2d34b3b125b8c3b968bc581708ab2cdf4 HTML5 VideoView change to use the new APIs: suspend/resume - While suspend and resume, using the new APIs in Mediaplayer Change-Id: I8530b533501607f681145853d7923fdf2009150b commit 9a20a522919d6e7e31a728abbee426b387a7daa3 Author: Steve Kondik Date: Tue Aug 13 00:53:21 2013 -0700 Generalize vectorization of Bitmap operation * All NEON-capable processors can support this. Change-Id: I13d448e5864ea804f66cd1bbb93360cb8c0f0806 commit 2c29b43b0f5348d0142a3a2fcebb3e0627aa3721 Author: Steve Kondik Date: Tue Aug 13 22:09:55 2013 -0700 alsa_sound: Improve USB device detection * Samsung's proprietary dock was hijacking the routing when a USB audio device such as a DAC was connected in host mode. * Instead of blindly shoving stuff down a route that doesn't work for the dock case, check the switch in sysfs for the proprietary dock first. * Remove the DOCK_USBAUDIO define entirely and just wrap it up with everything else that SAMSUNG_AUDIO includes. Change-Id: Id9ea2641b67c68a8b38d24aae88b186ee6e991f0 commit b0d6db5bfa364e83ad08bd78b07d683e3715270a Merge: 3951c22 1ec41c2 Author: Ricardo Cerqueira Date: Wed Aug 14 00:50:56 2013 +0000 Merge "wlconf: Fix compilation" into cm-10.2 commit 85920acd8f8bccc89462f23dbba98dd0ea42e15a Author: Ricardo Cerqueira Date: Tue Aug 13 16:35:00 2013 +0100 lm3530: Add a toggle for the CABC PWM commit e9263f41182bfadde6b0573d43c578b39bfb157d Merge: 0878d8a 4506575 Author: Danny Baumann Date: Tue Aug 13 14:47:37 2013 +0000 Merge "Don't sign DSPManager with the platform certificate." into cm-10.2 commit 82754311d06dc847652ffbb352fea68ccd69e40d Author: Ricardo Cerqueira Date: Wed Aug 14 03:46:44 2013 +0100 Camera: Fix the dimensions for 13 Mpx Change-Id: Iea85b642c5599ffefcddb82c10c56903db0cdab5 commit 862f0a9d2285dc060fb6edea3926e515cb72c09b Merge: fe1982d f99368f Author: Ricardo Cerqueira Date: Wed Aug 14 02:00:21 2013 +0000 Merge "Gallery2: Port additional camera resolutions from CM10.1" into cm-10.2 commit fdeff4724da426182671ff8038e52e9a04cc431d Merge: 8e04903 a2c8beb Author: David van Tonder Date: Tue Aug 13 21:24:35 2013 +0000 Merge "FLAG_ONE_SHOT is not guaranteed to update the extras." into cm-10.2 commit 8e04903452f923b6ffb43b02452b700e9e92f14e Author: Danesh Mondegarian Date: Fri Aug 9 20:55:54 2013 -0700 Settings : Re-organize menu structure Change-Id: I7e03f1a8e1da4545d933b91c1a50e5cf72ab4ab0 commit a2c8beb61e94a75bada08d78643bf25759351e01 Author: Danny Baumann Date: Tue Aug 13 16:42:09 2013 +0200 FLAG_ONE_SHOT is not guaranteed to update the extras. In contrast, according to the docs [1], FLAG_CANCEL_CURRENT is. Also keep track of the notifications on a per-device basis. [1] http://developer.android.com/reference/android/app/PendingIntent.html Change-Id: Ie04f60cde6a4332178373ce6be073e04036676c0 commit 42b1727b5268363659ea1d8843452a33dc1f7c7b Author: Danny Baumann Date: Tue Aug 13 16:36:20 2013 +0200 Fix coding style. Change-Id: I520b16f1c9a927a93d9e1bd4f7e712769d341e58 commit 0eb753d302374d73e16ace1db3417de9440c44d4 Author: Pradeep Panigrahi Date: Mon Mar 25 17:54:05 2013 +0530 Bluetooth : Remove out of range devices after ScanComplete Change to remove device from UI when Bluetooth of remote device is off or not discoverable anymore. Without this change a device that discovered previously is available in available devices list always, though the remote device is not discoverable anymore. The current change updates available devices list on scan complete removing the devices that are available in cached devices and are not disvorable anymore. Change-Id: I97809fcafd904271121e26741e50a9b61f0e0664 commit 6269f41a1076627f8cbc8a85e898ea2e99038d8e Author: Ashwini Munigala Date: Wed Jul 24 19:28:45 2013 +0530 PBAP: Fix device name update on authorization prompt from Notification. Use FLAG_ONE_SHOT for Notification PendingIntent to launch authorization prompt and display the updated device name for every new PBAP connection request. Change-Id: Ic9cbed92e2856ed2d2f4f807f7f8c39df7f98762 CRs-fixed: 515221 commit ba3d67ae7b0208da40ec8f0d1e694d829ef02e78 Merge: 4c4b308 bd3611d Author: Ricardo Cerqueira Date: Wed Aug 14 01:00:02 2013 +0000 Merge "fs_mgr: add support for "sync" mount flag" into cm-10.2 commit 7d5bb0c38572b08f1ac07a72741d2e5a1c2b0901 Author: Oleg Drokin Date: Tue Aug 13 15:31:35 2013 -0400 Do not print misleading completion messages on trim failure I/fstrim ( 124): Invoking FITRIM ioctl on /rom E/fstrim ( 124): FITRIM ioctl failed on /rom I/fstrim ( 124): Trimmed 18446744073709551615 bytes on /rom Yeah, right! Change-Id: I9996d15ced97da0ade576dfc9a059b2591504af1