summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Share Caches' index buffer with FontRenderer"Romain Guy2013-06-198-51/+24
|\
| * Share Caches' index buffer with FontRendererRomain Guy2013-06-188-51/+24
| | | | | | | | | | | | | | | | | | This reduces state changes when we draw 9patches and text together, which happens *a lot*. Also disable the NV profiling extension by default since it doesn't play nice with display lists deferrals. To enable it set debug.hwui.nv_profiling to true. Change-Id: I518b44b7d294e5def10c78911ceb9f01ae401609
* | am 42a6682e: am a5dc5846: am cc892d68: Merge "Change default for ↵Wink Saville2013-06-191-1/+1
|\ \ | | | | | | | | | | | | | | | | | | config_show4GForLte to true." into jb-mr2-dev * commit '42a6682ec62b4470f2c783c015d95fdc6f64610b': Change default for config_show4GForLte to true.
| * \ am a5dc5846: am cc892d68: Merge "Change default for config_show4GForLte to ↵Wink Saville2013-06-191-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | true." into jb-mr2-dev * commit 'a5dc5846502c13edd74ffd677d11e250b88ec17a': Change default for config_show4GForLte to true.
| | * \ am cc892d68: Merge "Change default for config_show4GForLte to true." into ↵Wink Saville2013-06-191-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'cc892d68c897f51b8998f7de11302bb9b9cebbff': Change default for config_show4GForLte to true.
| | | * \ Merge "Change default for config_show4GForLte to true." into jb-mr2-devWink Saville2013-06-191-1/+1
| | | |\ \
| | | | * | Change default for config_show4GForLte to true.Wink Saville2013-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9265217 Change-Id: I962910de7826ce9825de2d2dfb9e50b84d0e7c75
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-06-1949-348/+188
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-06-1749-348/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I070b09bc5d8bac8f0d5b36da87fe97cc205c0de2 Auto-generated-cl: translation import
* | | | | | | am c3e2a616: am 6e0e9b48: am 713c4bca: Update RenderScript doxygen reference ↵Stephen Hines2013-06-1953-1517/+5282
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manual. * commit 'c3e2a61608e0d2d2b1d268c12ab760db5cdbab59': Update RenderScript doxygen reference manual.
| * | | | | | am 6e0e9b48: am 713c4bca: Update RenderScript doxygen reference manual.Stephen Hines2013-06-1953-1517/+5282
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '6e0e9b48d0722ff96cfc69af1474572ee194da68': Update RenderScript doxygen reference manual.
| | * | | | | am 713c4bca: Update RenderScript doxygen reference manual.Stephen Hines2013-06-1953-1517/+5282
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '713c4bca939b8cd6ae4915c4ccf464eed7a8b6a6': Update RenderScript doxygen reference manual.
| | | * | | | Update RenderScript doxygen reference manual.Stephen Hines2013-06-1953-1517/+5282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0ba8f1c6c9b727b337708a3001964a7ee323483c
* | | | | | | Merge "NativeCrashListener: fix file descriptor leak."Nick Kralevich2013-06-191-0/+7
|\ \ \ \ \ \ \
| * | | | | | | NativeCrashListener: fix file descriptor leak.Nick Kralevich2013-06-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sending thousands of crashes can result in the system eventually running out of file descriptors. Close file descriptors after we're done with them. Change-Id: I09ae9ce36426ded3fd591dda9a3550a19c2f01d3
* | | | | | | | Enable preloading of the appropriate WebView.Torne (Richard Coles)2013-06-193-37/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the appropriate WebView to be preloaded in the zygote by constructing the currently selected WebViewFactoryProvider when the WebViewFactory is preloaded. At runtime, if the preloaded provider is still the current selection, the preloaded instance is used, otherwise the provider is loaded at that time. This change also removes "graceful" fallback from the experimental WebView to the classic implementation: if the option to use the experimental WebView is selected and it could not be loaded successfully at the time a WebView is created, an exception will be thrown, rather than allowing execution to continue with the classic implementation, as the fallback may mislead developers who do not examine logcat output in detail. Change-Id: I0cd01c784d7048abeac55ab5863ca16b8fd9ecf2
* | | | | | | | Merge "Fix docs"Jason Sams2013-06-191-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix docsJason Sams2013-06-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie6563f633481951d97f319aefd282b15c049e281
* | | | | | | | | Merge "Update histogram docs."Jason Sams2013-06-191-6/+44
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Update histogram docs.Jason Sams2013-06-181-6/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6cfedb5cac459befb083f352f43ed33f4418145a
* | | | | | | | | Merge "Allow single channel and float convolve."Jason Sams2013-06-192-1/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Allow single channel and float convolve.Jason Sams2013-06-182-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If448ea2ae38de2f8b95fc884ea0dbf8222964012
* | | | | | | | | am 2a155213: am 66acbc22: am 0dff78aa: Merge "Revert "wifi: Get full scan ↵Iliyan Malchev2013-06-182-40/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | results"" into jb-mr2-dev * commit '2a155213c85f84a944551c09c0eefde3368267db': Revert "wifi: Get full scan results"
| * | | | | | | am 66acbc22: am 0dff78aa: Merge "Revert "wifi: Get full scan results"" into ↵Iliyan Malchev2013-06-182-40/+7
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '66acbc221b750a645a1c9581f4a5bbe52e38729c': Revert "wifi: Get full scan results"
| | * | | | | | am 0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-devIliyan Malchev2013-06-182-40/+7
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '0dff78aa32d8e7bc2eb057f2878a9e010417e42a': Revert "wifi: Get full scan results"
| | | * | | | | Merge "Revert "wifi: Get full scan results"" into jb-mr2-devIliyan Malchev2013-06-192-40/+7
| | | |\ \ \ \ \
| | | | * | | | | Revert "wifi: Get full scan results"Vineeta Srivastava2013-06-182-40/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 67b3fbf49c0c92641e19e3278a1feab7b68aa7b8. Change-Id: I458924e6c95661f522ffa5e7780c6888cdb3a713 Conflicts: wifi/java/android/net/wifi/WifiNative.java wifi/java/android/net/wifi/WifiStateMachine.java
* | | | | | | | | Add support for vec2 histogramJason Sams2013-06-181-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30ab758a44485a8ea30043c4cd782c3560074c58
* | | | | | | | | Merge "Add histogram intrinsic"Jason Sams2013-06-192-0/+153
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add histogram intrinsicJason Sams2013-06-182-0/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I67bcaaef033d8770047923e8243e739010238539
* | | | | | | | | | Merge "Fix stack transfer bug."Craig Mautner2013-06-183-24/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix stack transfer bug.Craig Mautner2013-06-183-24/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the focused stack to the task with the started activity. Do not refocus when activities report resume. Add more conditional debug. Fixes bug 9481679. Change-Id: Ib7134e88f9a2c8ad1703af0d43442c8bbe4e65dc
* | | | | | | | | | | Merge "Fix potential NPE if there is no child in HorizontalScrollView"Fabrice Di Meglio2013-06-181-5/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix potential NPE if there is no child in HorizontalScrollViewFabrice Di Meglio2013-06-181-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - related to the previous change for saving the scroll position - also related to bug #9463581 NPE observed while launching News&Weather app from all apps tray Change-Id: I9f2f8a246e793eefa1cf510e15a56a1058fb9c18
* | | | | | | | | | | | Correctly update the source of recurring subtree change accessibility events.Svetoslav2013-06-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b0fd9224a5208b274e5c889a27417ef13579849
* | | | | | | | | | | | Merge "Move Keyguard to the systemui process."Jim Miller2013-06-182-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move Keyguard to the systemui process.Jim Miller2013-06-182-1/+2
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should save some memory on devices with limited amounts of RAM by allowing it to share the graphics context with systemui. Initially, adding this to the systemui process triggered a bug where the shared process id didn't exist in the table yet. The change to ActiveServices tries to work around this by explicitly adding the package in attachApplicationLocked(). Change-Id: I9e97d5d69ddd15d7f16aca83a57bdf381811a13b
* | | | | | | | | | | | Merge "Add test for streaming display contents to an accessory."Jeff Brown2013-06-1834-0/+3005
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add test for streaming display contents to an accessory.Jeff Brown2013-06-1834-0/+3005
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two applications: a source and a sink. They should be installed on two separate Android devices. Then connect the source device to the sink device using a USB OTG cable. Bug: 9192512 Change-Id: I99b552026684abbfd69cb13ab324e72fa16c36ab
* | | | | | | | | | | | | Merge "Add an API to allow for creating private virtual displays."Jeff Brown2013-06-1813-77/+724
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Add an API to allow for creating private virtual displays.Jeff Brown2013-06-1813-77/+724
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables applications to create a private virtual display that renders its content to a surface of its own creation. The display is private in the sense that only the application that owns the display is allowed to place windows upon it. Mirroring and blanking is also disabled for these displays. Bug: 9192512 Change-Id: I852ea07f0c7df1d244e354e3daca3a6960285ca0
* | | | | | | | | | | | | am 9f9f9012: am c485361e: am 99700bfe: update supported media formats. as ↵Scott Main2013-06-181-10/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | / / / / / / / | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | per I6372badc3d3a0fcbb1c132e3113331a79b17c26c * commit '9f9f901200680b2dee5839d68bee4240b7aed21f': update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
| * | | | | | | | | | | am c485361e: am 99700bfe: update supported media formats. as per ↵Scott Main2013-06-181-10/+55
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I6372badc3d3a0fcbb1c132e3113331a79b17c26c * commit 'c485361e9cf5768174310e9e65ee5df4614eb601': update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
| | * | | | | | | | | | am 99700bfe: update supported media formats. as per ↵Scott Main2013-06-181-10/+55
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I6372badc3d3a0fcbb1c132e3113331a79b17c26c * commit '99700bfee02dd99e47bca5f0ab4e841239deda04': update supported media formats. as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c
| | | * | | | | | | | | update supported media formats.Scott Main2013-06-181-10/+55
| | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c Change-Id: If35f4bb35b8aabacb51dec79a00a0c353b8a5d3c
* | | | | | | | | | | Merge "Fix bug #9463581 NPE observed while launching News&Weather app from ↵Fabrice Di Meglio2013-06-181-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all apps tray"
| * | | | | | | | | | | Fix bug #9463581 NPE observed while launching News&Weather app from all apps ↵Fabrice Di Meglio2013-06-181-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tray - dont suppose that there will always be one child Change-Id: I51c5cdf06294af25c992cfbaacabbc29dd1b9ad3
* | | | | | | | | | | | Merge "Crash in ViewRootImpl when accessibility is on."Svetoslav2013-06-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Crash in ViewRootImpl when accessibility is on.Svetoslav2013-06-181-1/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We fire view subtree mutation events every X amount of time. It was possible that the runnable that fires an event to be scheduled more than once while this should not happen. As a result there was a crash since we did not expect to have a second run and nullified a reference. bug:9422804 Change-Id: I914e163b026cd217e1536ab0ed3a6b11113c2c73
* | | | | | | | | | | Merge "Remove un-used snippetize method from ContactsContract."Chiao Cheng2013-06-181-137/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |