summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* split ComposerService out of SurfaceComposerClient.hMathias Agopian2011-11-288-21/+65
| | | | Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6
* rewrite SF's message loop on top of LooperMathias Agopian2011-11-283-216/+64
| | | | Change-Id: Ib56139f87a5c0b124e34da5c8151207219b2577b
* Merge "Make AudioTrack a RefBase so wrappers not needed"Glenn Kasten2011-11-281-1/+1
|\
| * Make AudioTrack a RefBase so wrappers not neededGlenn Kasten2011-11-151-1/+1
| | | | | | | | Change-Id: I2305abe586ac41251af04a194bc818c110a1b293
* | am 70a1ee38: am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1Eric Rowe2011-11-283-1/+14
|\ \ | | | | | | | | | | | | * commit '70a1ee38b24a7c8dfc789db024bdf54f277ddba3': Fix SCO start stop tests.
| * \ am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1Eric Rowe2011-11-283-1/+14
| |\ \ | | | | | | | | | | | | | | | | * commit '500afb87a7a8b5928ef1a5196bdfd0bcc2b87e4a': Fix SCO start stop tests.
| | * \ Merge "Fix SCO start stop tests." into ics-mr1Eric Rowe2011-11-283-1/+14
| | |\ \
| | | * | Fix SCO start stop tests.Eric Rowe2011-11-223-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf292bc244a494e2ffb11359e83c0d072907ea3b Bug-id: http://b/5644683
* | | | | am be1b5ce4: am a6f8ebc6: Merge "Fix TTS instantiation from webview ↵Narayan Kamath2011-11-283-6/+31
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | accessibility handlers." into ics-mr1 * commit 'be1b5ce498a68e28d47a167495f47787d6461e88': Fix TTS instantiation from webview accessibility handlers.
| * | | | am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility ↵Narayan Kamath2011-11-283-6/+31
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | handlers." into ics-mr1 * commit 'a6f8ebc616cfe3185ae2513ef2f846e8d32b551e': Fix TTS instantiation from webview accessibility handlers.
| | * | | Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1Narayan Kamath2011-11-283-6/+31
| | |\ \ \
| | | * | | Fix TTS instantiation from webview accessibility handlers.Narayan Kamath2011-11-283-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TTS instantiated from here shouldn't clobber any existing TTS objects opened within the same package context. Ideally, the TTS API should work fine with multiple TTS object instances within the same package context but making that happen correctly is a larger change. bug:5659758 Change-Id: Ia1f63c61b9f12ac92ff42a427a004d414e42a759
* | | | | | am aceb7f8b: am 425c595a: Merge "Update Webkit with the zoom level after ↵Derek Sollenberger2011-11-281-0/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | double tap gesture" into ics-mr1 * commit 'aceb7f8b29bdcf8bf7fdc14ec9b99f54f2a2a3d2': Update Webkit with the zoom level after double tap gesture
| * | | | | am 425c595a: Merge "Update Webkit with the zoom level after double tap ↵Derek Sollenberger2011-11-281-0/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gesture" into ics-mr1 * commit '425c595acb798ed9652b5a1f0e5412cbd8e3873d': Update Webkit with the zoom level after double tap gesture
| | * | | | Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1Derek Sollenberger2011-11-281-0/+5
| | |\ \ \ \
| | | * | | | Update Webkit with the zoom level after double tap gestureDerek Sollenberger2011-11-281-0/+5
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the hardware accelerated case we were not updating webkit with the new zoom information. This was causing plugins to render at the old zoom level. bug: 5663981 Change-Id: I3cb18ad9ca4f185f384ea9fb68780f29160391ad
* | | | | | am b11387a6: am 2ffc9ec3: Ensure we dismiss the <select> option dialog.Ben Murdoch2011-11-281-0/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'b11387a6e51c424e421b0951de20db46a5f5c992': Ensure we dismiss the <select> option dialog.
| * | | | | am 2ffc9ec3: Ensure we dismiss the <select> option dialog.Ben Murdoch2011-11-281-0/+10
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '2ffc9ec3d69d8ee95bce1ccf17163a70b0bd9003': Ensure we dismiss the <select> option dialog.
| | * | | | Ensure we dismiss the <select> option dialog.Ben Murdoch2011-11-281-0/+10
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the WebView is paused, or another action (such as navigating to a new URL) occurs, cancel any ongoing <select> tag dialog that is open. Bug: 5666545 Change-Id: Ifc35a239b729ed93cbf82b2096334f7d63f8993d
* | | | | Remove dead code.Logan Chien2011-11-272-4/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2838a40026291e7345b07911af3ba17278b63ffe
* | | | | Merge "Use sized integer typedefs in hash_type specializations."Jeff Brown2011-11-241-8/+8
|\ \ \ \ \
| * | | | | Use sized integer typedefs in hash_type specializations.Jeff Brown2011-11-241-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3f9e004db2f3be1cb43a885c3ae142f251fd6845
* | | | | | am b567c41b: am e35581ad: Merge "Fix regressions in TTS completion ↵Narayan Kamath2011-11-245-19/+65
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | callbacks." into ics-mr1 * commit 'b567c41b00fd196a2994f3cf8090b8a503c04939': Fix regressions in TTS completion callbacks.
| * | | | | am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1Narayan Kamath2011-11-245-19/+65
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'e35581ad5ad635f9dcfe4ab6a432c48b46b782cd': Fix regressions in TTS completion callbacks.
| | * | | | Merge "Fix regressions in TTS completion callbacks." into ics-mr1Narayan Kamath2011-11-245-19/+65
| | |\ \ \ \
| | | * | | | Fix regressions in TTS completion callbacks.Narayan Kamath2011-11-245-19/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (a) onUtteranceCompleted should be called on errors too. Also, fix up the error handling so that onUtteranceCompleted is always called. (b) Don't treat empty utterances as errors, and let the engine synthesize them, as before. bug:5662598 Change-Id: I9223592bc6fe5f47d71103f4f02f046b54a655a8
* | | | | | | am 694b266e: am 7b6d238b: Merge "Fix tethering interaction from wifi" into ↵Irfan Sheriff2011-11-231-15/+191
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '694b266e0366e5400d577659d1bb8152f0a106e7': Fix tethering interaction from wifi
| * | | | | | am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1Irfan Sheriff2011-11-231-15/+191
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '7b6d238b7515fdd070c361a03e99e6022f2cd2ba': Fix tethering interaction from wifi
| | * | | | | Merge "Fix tethering interaction from wifi" into ics-mr1Irfan Sheriff2011-11-231-15/+191
| | |\ \ \ \ \
| | | * | | | | Fix tethering interaction from wifiIrfan Sheriff2011-11-231-15/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use the right interface for untether - Wait till tethering service confirms that untether() is successful before shutting down soft Ap. This helps to make sure interface does not go away before clean up is done. Bug: 5659166 Change-Id: Iff9d4a67ff40664c2114e766590d6a83b7739738
* | | | | | | | am 08b52112: am e95f4986: Merge "Fix a build break." into ics-mr1John Wang2011-11-231-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '08b52112335dcbcd51fa387c2a9a92dc43efa689': Fix a build break.
| * | | | | | | am e95f4986: Merge "Fix a build break." into ics-mr1John Wang2011-11-231-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e95f49869b02dd9792718fb1075241acdf6ca775': Fix a build break.
| | * | | | | | Merge "Fix a build break." into ics-mr1John Wang2011-11-231-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | Fix a build break.John Wang2011-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a9ceaace02f442c5e36fa8425b051116c81e76f
* | | | | | | | | am 42afab37: am 8ce22f26: Fixing a typo in framework widget paddingAdam Cohen2011-11-231-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '42afab3799c5dba8abccabe231b74c96d5ff0c14': Fixing a typo in framework widget padding
| * | | | | | | | am 8ce22f26: Fixing a typo in framework widget paddingAdam Cohen2011-11-231-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8ce22f2644acb51bfe0b9d600f1d2ad64e80513c': Fixing a typo in framework widget padding
| | * | | | | | | Fixing a typo in framework widget paddingAdam Cohen2011-11-231-2/+2
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I90733500487b3e9fb1ff19a7b946d6faf526a2c1 Conflicts: core/res/res/values-sw600dp/dimens.xml
* | | | | | | | am 39c293f4: am 9b108009: Check watingApns before access it.John Wang2011-11-231-2/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | * commit '39c293f4392f6c4bb4da6182123a0511cabb0df1': Check watingApns before access it.
| * | | | | | am 9b108009: Check watingApns before access it.John Wang2011-11-231-2/+8
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '9b1080091c4ac97378db366cdd6961aba28756c5': Check watingApns before access it.
| | * | | | | Check watingApns before access it.John Wang2011-11-231-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5663125 Change-Id: I66275fafd316f318f9035ac11c16a30fcb32f7c8
* | | | | | | Merge "Add a basic hashtable data structure, with tests!"Jeff Brown2011-11-237-1/+1402
|\ \ \ \ \ \ \
| * | | | | | | Add a basic hashtable data structure, with tests!Jeff Brown2011-11-227-1/+1402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The basic hashtable is intended to be used to support a variety of different datastructures such as map, set, multimap, multiset, linkedmap, generationcache, etc. Consequently its interface is fairly primitive. The basic hashtable supports copy-on-write style functionality using SharedBuffer. The change introduces a simple generic function in TypeHelpers for specifying hash functions. The idea is to add template specializations of hash_type<T> next to the relevant data structures such as String8, String16, sp<T>, etc. Change-Id: I2c479229e9d4527b4fbfe3b8b04776a2fd32c973
* | | | | | | | Merge "Add support for handling a bitcode wrapper to librs."Stephen Hines2011-11-231-1/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Add support for handling a bitcode wrapper to librs.Stephen Hines2011-11-221-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=5425905 Change-Id: I75676060703df6d9043b287fea900c4379455ee2
* | | | | | | | | am f6422f5f: am 20398fac: Merge "audioflinger: reduce sleep time to avoid ↵Eric Laurent2011-11-231-1/+23
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | underrun" into ics-mr1 * commit 'f6422f5f5d04aab47f8f36a0ea92e2140bed0105': audioflinger: reduce sleep time to avoid underrun
| * | | | | | | | am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ↵Eric Laurent2011-11-231-1/+23
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '20398fac99ff78cb3ec3dd122930e45d409e0524': audioflinger: reduce sleep time to avoid underrun
| | * | | | | | | Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1Eric Laurent2011-11-231-1/+23
| | |\ \ \ \ \ \ \
| | | * | | | | | | audioflinger: reduce sleep time to avoid underrunEric Laurent2011-11-221-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Progressively reduce the sleep time applied in MixerThread::threadLoop() in case of consecutive application underruns to avoid starving the audio HAL. As the default sleep time is longer than the duration of an audio buffer we ended up writing less data than needed by the audio HAL if the condition persisted. Issue 5553055. Change-Id: I2b23ee79c032efa945025db228beaecd1e07a2e5
* | | | | | | | | | am a181a919: am 37ac88f9: Merge "Update description of account_type" into ↵Michael Chan2011-11-231-5/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'a181a9197c0affbcddd627c625c8064f494b94d6': Update description of account_type
| * | | | | | | | | am 37ac88f9: Merge "Update description of account_type" into ics-mr1Michael Chan2011-11-231-5/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '37ac88f994c5b8af291acd9c8d7eb5e22ce3c489': Update description of account_type