summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cleanup. waitForCondition() now uses polymorphsim instead of templtesMathias Agopian2010-04-284-93/+94
| | | | | | | | | the reason for the above change is that waitForCondition() had become large over time, mainly to handle error cases, using inlines to evaluate the condition doesn't buys us much anymore while it increases code size. Change-Id: I2595d850832628954b900ab8bb1796c863447bc7
* fix a race condition in undoDequeue(), where 'tail' could be computed ↵Mathias Agopian2010-04-282-26/+13
| | | | | | | | | | | | | | | incorrectly. in the undoDequeue() case, 'tail' was recalculated from 'available' and 'head' however there was a race between this and retireAndLock(), which could cause 'tail' to be recalculated wrongly. the interesting thing though is that retireAndLock() shouldn't have any impact on the value of 'tail', which is client-side only attribute. we fix the race by saving the value of 'tail' before dequeue() and restore it in the case of undoDequeue(), since we know it doesn't depend on retireAndLock(). Change-Id: I4bcc4d16b6bc4dd93717ee739c603040b18295a0
* am 3b20c9e8: am 81ac367b: Merge "Fix a minor bug in transitions to ↵Steve Howard2010-04-281-1/+1
|\ | | | | | | | | | | | | | | | | left-edge-up landscape." into froyo Merge commit '3b20c9e80533401d8c423977ef86460d789d4e1e' into kraken * commit '3b20c9e80533401d8c423977ef86460d789d4e1e': Fix a minor bug in transitions to left-edge-up landscape.
| * am 81ac367b: Merge "Fix a minor bug in transitions to left-edge-up ↵Steve Howard2010-04-281-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | landscape." into froyo Merge commit '81ac367be66905a5b53b8e7e98160546802bd98b' into froyo-plus-aosp * commit '81ac367be66905a5b53b8e7e98160546802bd98b': Fix a minor bug in transitions to left-edge-up landscape.
| | * Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyoSteve Howard2010-04-281-1/+1
| | |\
| | | * Fix a minor bug in transitions to left-edge-up landscape.Steve Howard2010-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MAX_TRANSITION_TILT to remove the entry for upside-down orientation, which should've been removed when that orientation itself was removed. This was causing the phone to require further vertical tilt for transitions to left-edge-up landscape, as compared to right-edge-up landscape or portait mode. Bug: 2639310 Change-Id: I8fe2e2baecd6a9c2cecae95d316b0d4e2f8ee251
* | | | am c8652199: merge from open-source masterThe Android Open Source Project2010-04-281-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'c8652199d14dc42edf882a8eb9e48a5fe0b6101d' into kraken * commit 'c8652199d14dc42edf882a8eb9e48a5fe0b6101d': speling fix
| * | | merge from open-source masterThe Android Open Source Project2010-04-281-1/+1
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010
| | * | | speling fixhugh kennedy2010-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia9db6e1c5d1cd31fd028d551cc357a76049ce137
* | | | | am 91a62f3d: am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor ↵Vasu Nori2010-04-282-7/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | execution\' to ContentProvider" into froyo Merge commit '91a62f3d4a6b4f92c694d09e991fc6f82701fc47' into kraken * commit '91a62f3d4a6b4f92c694d09e991fc6f82701fc47': bug:2622719 move 'forcing of cursor execution' to ContentProvider
| * | | | am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to ↵Vasu Nori2010-04-282-7/+9
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContentProvider" into froyo Merge commit 'a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06' into froyo-plus-aosp * commit 'a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06': bug:2622719 move 'forcing of cursor execution' to ContentProvider
| | * | | Merge "bug:2622719 move 'forcing of cursor execution' to ContentProvider" ↵Vasu Nori2010-04-282-7/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | into froyo
| | | * | | bug:2622719 move 'forcing of cursor execution' to ContentProviderVasu Nori2010-04-282-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert part of the CL: Ia561135e974a44ad3e3774ecb23c6a3d0fc38176 and add it to ContentProvider.query() to force query execution in worker thread, instead of having the main thread incur the cost of query execution and potentially get ANR Change-Id: I0ea8a170bd954a421f4ad825f8090319a83a5b2b
* | | | | | am 087b25f7: am 6e4895b6: Merge "Make timezone changes apply to status bar ↵Amith Yamasani2010-04-281-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time in 24hr mode. Bug: 2632681" into froyo Merge commit '087b25f7e2669497cf217d873437e8726c139abd' into kraken * commit '087b25f7e2669497cf217d873437e8726c139abd': Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
| * | | | | am 6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr ↵Amith Yamasani2010-04-281-0/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode. Bug: 2632681" into froyo Merge commit '6e4895b63aa64a8df64dd69c49a414b7566932d3' into froyo-plus-aosp * commit '6e4895b63aa64a8df64dd69c49a414b7566932d3': Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
| | * | | | Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: ↵Amith Yamasani2010-04-281-0/+3
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | 2632681" into froyo
| | | * | | Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681Amith Yamasani2010-04-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SimpleDateFormat was being cached and new timezone not being applied. Make sure to apply the new timezone to the format object as soon as it changes. Change-Id: I72abfef2e14cf5db5a6e8cb71b053380b695495c
* | | | | | am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that ↵Fred Quintana2010-04-281-5/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo Merge commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071' into kraken * commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071': revert a change in the SyncManager that caused it to not cancel
| * | | | | am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not ↵Fred Quintana2010-04-281-5/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cancel long running syncs if the next sync had the same account and authority." into froyo Merge commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp * commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814': revert a change in the SyncManager that caused it to not cancel
| | * | | | Merge "revert a change in the SyncManager that caused it to not cancel long ↵Fred Quintana2010-04-281-5/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | running syncs if the next sync had the same account and authority." into froyo
| | | * | | revert a change in the SyncManager that caused it to not cancelFred Quintana2010-04-271-5/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | long running syncs if the next sync had the same account and authority. Change-Id: I0c18ce3b7098e79e2080e401e441ad246b1d6910 http://b/2631221
* | | | | am 725f731c: am bc5a0328: Merge "Fix issue #2569139: Sapphire user cannot ↵Dianne Hackborn2010-04-281-9/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | login to last.fm..." into froyo Merge commit '725f731cb9368f52a0c6664d2961ef4340c8f7a0' into kraken * commit '725f731cb9368f52a0c6664d2961ef4340c8f7a0': Fix issue #2569139: Sapphire user cannot login to last.fm...
| * | | | am bc5a0328: Merge "Fix issue #2569139: Sapphire user cannot login to ↵Dianne Hackborn2010-04-281-9/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | last.fm..." into froyo Merge commit 'bc5a03286a72dc3627cee313d473178f5a123049' into froyo-plus-aosp * commit 'bc5a03286a72dc3627cee313d473178f5a123049': Fix issue #2569139: Sapphire user cannot login to last.fm...
| | * | | Merge "Fix issue #2569139: Sapphire user cannot login to last.fm..." into froyoDianne Hackborn2010-04-281-9/+10
| | |\ \ \
| | | * | | Fix issue #2569139: Sapphire user cannot login to last.fm...Dianne Hackborn2010-04-281-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...after upgrade from Donut to FRF01B For realz this time. Change-Id: I92bd12451b19a6006cf487a9dfa0b7c696a21122
* | | | | | Merge "Use timestamp from camera driver for CameraSource" into krakenJames Dong2010-04-287-71/+127
|\ \ \ \ \ \
| * | | | | | Use timestamp from camera driver for CameraSourceJames Dong2010-04-287-71/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I09ddec69997c43b8f17fdd21304c76cb4c5ab8cf
* | | | | | | am 9fe55514: am 4bba2149: Merge "Import revised translations" into froyoKenny Root2010-04-2820-99/+135
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9fe55514524993936eafe9e77e3dd98ba17a78b6' into kraken * commit '9fe55514524993936eafe9e77e3dd98ba17a78b6': Import revised translations
| * | | | | | am 4bba2149: Merge "Import revised translations" into froyoKenny Root2010-04-2820-99/+135
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4bba2149f3f2709b24dc40118461c5d683ed6965' into froyo-plus-aosp * commit '4bba2149f3f2709b24dc40118461c5d683ed6965': Import revised translations
| | * | | | | Merge "Import revised translations" into froyoKenny Root2010-04-2820-99/+135
| | |\ \ \ \ \
| | | * | | | | Import revised translationsKenny Root2010-04-2720-99/+135
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | Change-Id: I03670c68c861c85e299c020bef04b663ac28b69c
* | | | | | | am ca54674c: am eaa801e2: Merge "docs: update information about developing ↵Scott Main2010-04-284-244/+314
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE Merge commit 'ca54674c656b5cf66cfeda42ef7a640971618f2a' into kraken * commit 'ca54674c656b5cf66cfeda42ef7a640971618f2a': docs: update information about developing on a device.
| * | | | | | am eaa801e2: Merge "docs: update information about developing on a device. ↵Scott Main2010-04-284-244/+314
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to sp Merge commit 'eaa801e22abb3ea952ecd70ed7d0a876a1e2e3c9' into froyo-plus-aosp * commit 'eaa801e22abb3ea952ecd70ed7d0a876a1e2e3c9': docs: update information about developing on a device.
| | * | | | | Merge "docs: update information about developing on a device. Remove details ↵Scott Main2010-04-274-244/+314
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to specifically describe using a device and make both docs more consistent with each other." into froyo
| | | * | | | | docs: update information about developing on a device.Scott Main2010-04-274-244/+314
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to specifically describe using a device and make both docs more consistent with each other. Change-Id: Ica77533e78141db43eb3ed214309f571beff7353
* | | | | | | am 785c8983: am 996960de: Merge "remove myname accidentally included in one ↵Vasu Nori2010-04-271-2/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the files" into froyo Merge commit '785c89835741ca735fbb766bc2e1aeb68a4d5169' into kraken * commit '785c89835741ca735fbb766bc2e1aeb68a4d5169': remove myname accidentally included in one of the files
| * | | | | | am 996960de: Merge "remove myname accidentally included in one of the files" ↵Vasu Nori2010-04-271-2/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888' into froyo-plus-aosp * commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888': remove myname accidentally included in one of the files
| | * | | | | Merge "remove myname accidentally included in one of the files" into froyoVasu Nori2010-04-271-2/+0
| | |\ \ \ \ \
| | | * | | | | remove myname accidentally included in one of the filesVasu Nori2010-04-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I189db1cc60069b4318fa32a8b5aea6916ac5aa4e
* | | | | | | | am 048b40eb: am e367896e: Merge "Fix issue #2594388: WallpaperService ↵Dianne Hackborn2010-04-271-29/+49
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn\'t always call onSurfaceDestroyed()" into froyo Merge commit '048b40ebdc980906193cfcb66274e2a1f3ec6093' into kraken * commit '048b40ebdc980906193cfcb66274e2a1f3ec6093': Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()
| * | | | | | | am e367896e: Merge "Fix issue #2594388: WallpaperService doesn\'t always ↵Dianne Hackborn2010-04-271-29/+49
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | call onSurfaceDestroyed()" into froyo Merge commit 'e367896e91a0d75250f00f2de3929495595719d4' into froyo-plus-aosp * commit 'e367896e91a0d75250f00f2de3929495595719d4': Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()
| | * | | | | | Merge "Fix issue #2594388: WallpaperService doesn't always call ↵Dianne Hackborn2010-04-271-29/+49
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | onSurfaceDestroyed()" into froyo
| | | * | | | | Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()Dianne Hackborn2010-04-271-29/+49
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take care of the window manager destroying a surface, to report to the app that it has been destroyed. Make sure to perform a traversal when becoming visible to re-create the surface if needed. Change-Id: If3bc05e0106f90d4c3bad2d7575212667680fbc8
* | | | | | | am 447beb52: am 05fd7e7d: Add good international characters to the path part ↵Shimeng (Simon) Wang2010-04-272-1/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of Url pattern. Merge commit '447beb52be8f97154db2273b4130fd83bf34d840' into kraken * commit '447beb52be8f97154db2273b4130fd83bf34d840': Add good international characters to the path part of Url pattern.
| * | | | | | am 05fd7e7d: Add good international characters to the path part of Url pattern.Shimeng (Simon) Wang2010-04-272-1/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '05fd7e7d328261260a348c0b6ba840bc1f60cb14' into froyo-plus-aosp * commit '05fd7e7d328261260a348c0b6ba840bc1f60cb14': Add good international characters to the path part of Url pattern.
| | * | | | | Add good international characters to the path part of Url pattern.Shimeng (Simon) Wang2010-04-272-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib24f8ffc8554366cb4350ec2f9d7e77efb0cb083
* | | | | | | am b40cfc16: am 2ea21a84: Merge "Fix a WebView scrolling regression - bug ↵Adam Powell2010-04-271-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2633572." into froyo Merge commit 'b40cfc162fc473aece63f449eaa1dd643d24b9c0' into kraken * commit 'b40cfc162fc473aece63f449eaa1dd643d24b9c0': Fix a WebView scrolling regression - bug 2633572.
| * | | | | | am 2ea21a84: Merge "Fix a WebView scrolling regression - bug 2633572." into ↵Adam Powell2010-04-271-0/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | froyo Merge commit '2ea21a84ef81849153f30bbea213acd5be110c08' into froyo-plus-aosp * commit '2ea21a84ef81849153f30bbea213acd5be110c08': Fix a WebView scrolling regression - bug 2633572.
| | * | | | | Merge "Fix a WebView scrolling regression - bug 2633572." into froyoAdam Powell2010-04-271-0/+4
| | |\ \ \ \ \
| | | * | | | | Fix a WebView scrolling regression - bug 2633572.Adam Powell2010-04-271-0/+4
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mLastTouchX/Y on every drag. This prevents the creation of dead zones that the user has to drag back out of at the edges of a document. Change-Id: I348d96dfd3907dba7c6ddd86b678329d65063ba9
generated by cgit v1.1 at 2025-02-06 06:07:44 +0000