Andreas Huber
8070c93bbc
am b7a69ce8: am fe324a61: Merge change I8d87cd98 into eclair-mr2
...
Merge commit 'b7a69ce8f2d05c523ad964e98f490fe3c060a420'
* commit 'b7a69ce8f2d05c523ad964e98f490fe3c060a420':
Fix various compiler warnings accumulated over time.
2009-10-13 17:07:37 -07:00
Robert Greenwalt
347a38d412
am 00f166de: am ceabc645: am 16cb04ab: Merge change If1acb2dd into eclair
...
Merge commit '00f166dedca88a781e7a64c07a42451a213f04ed'
* commit '00f166dedca88a781e7a64c07a42451a213f04ed':
Add a little logging to diagnose wifi cycle bug
2009-10-13 17:07:01 -07:00
Dave Sparks
9369da650b
am d6e86a68: am 7d4acc53: am 69e2ef47: Merge change I9f93ce61 into eclair
...
Merge commit 'd6e86a687d57851b90d025ae33a8e4021bffe10d'
* commit 'd6e86a687d57851b90d025ae33a8e4021bffe10d':
Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 17:06:52 -07:00
Andreas Huber
b90f392b07
am 9550e289: am cfd55579: OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
...
Merge commit '9550e2892f88194c9abbb85616bb55db67231d6e'
* commit '9550e2892f88194c9abbb85616bb55db67231d6e':
OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
2009-10-13 17:06:41 -07:00
Grace Kloba
da416a2c74
am 4d915e00: am d5ad08bd: am 2e778c17: Merge change I124356f6 into eclair
...
Merge commit '4d915e00dcf40143f9caf89fd8eeadd32a8cb6f4'
* commit '4d915e00dcf40143f9caf89fd8eeadd32a8cb6f4':
Continue caching "POST" result so that we won't get
2009-10-13 17:05:30 -07:00
Chung-yih Wang
672ce084cb
am 3adcc218: am cf4f2c22: Merge change Ic6d1545d into eclair-mr2
...
Merge commit '3adcc2184998a0e22df430bb75d056fbb00b6244'
* commit '3adcc2184998a0e22df430bb75d056fbb00b6244':
Support double-quote SSID in WifiService.
2009-10-13 17:05:20 -07:00
Andreas Huber
12a0b10bec
am 96c1dfcc: am 63f20ec1: Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
...
Merge commit '96c1dfccb275b2a2cb7f7b0005cd481e8cb59f8e'
* commit '96c1dfccb275b2a2cb7f7b0005cd481e8cb59f8e':
Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
2009-10-13 17:04:28 -07:00
Andreas Huber
3e99333a34
am c55bb59e: am ef703f60: Merge change I98276091 into eclair-mr2
...
Merge commit 'c55bb59e542368500937d6737ce2ea2d3524d6d7'
* commit 'c55bb59e542368500937d6737ce2ea2d3524d6d7':
Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
2009-10-13 17:04:19 -07:00
Daisuke Miyakawa
cc2b12dc6f
am 4fce5c81: am 7c6770c2: Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which enables vCard composer to append "TYPE=" to type param/attribute everytime possible, which should fix the issue 2180800.
...
Merge commit '4fce5c81d5b166920c60d4a907e581c71c215858'
* commit '4fce5c81d5b166920c60d4a907e581c71c215858':
Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which
2009-10-13 17:03:53 -07:00
Daisuke Miyakawa
9d2452cec6
am 2c0fe9b0: am d48e25d4: Merge change I83b3bddf into eclair-mr2
...
Merge commit '2c0fe9b0f67441c51589a8a9f674efde0c0da2ba'
* commit '2c0fe9b0f67441c51589a8a9f674efde0c0da2ba':
Add a new TestSuites: VCardTests
2009-10-13 17:03:34 -07:00
Libin Tang
2bba181288
am 715aba5a: am edb98812: am febb94cd: Make standard roaming indicator display indications configurable
...
Merge commit '715aba5a7a9970cb4413041644f002823dfbd08b'
* commit '715aba5a7a9970cb4413041644f002823dfbd08b':
Make standard roaming indicator display indications configurable
2009-10-13 17:03:19 -07:00
Daisuke Miyakawa
42f9119a39
am 74a2d09c: am 347daf3a: Merge change I2a52a60a into eclair-mr2
...
Merge commit '74a2d09cba89db3b404aa10d89b5139f5ff6ab5d'
* commit '74a2d09cba89db3b404aa10d89b5139f5ff6ab5d':
Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
2009-10-13 17:02:58 -07:00
Robert Greenwalt
cc4b875dc6
am e93f07c3: am 1cf6c2c3: am 6d02f3f3: Merge change I71f48a21 into eclair
...
Merge commit 'e93f07c3f8148ae249292ef05d2da8ac65428950'
* commit 'e93f07c3f8148ae249292ef05d2da8ac65428950':
Reduce the amount of EriManager Logging.
2009-10-13 17:02:11 -07:00
Dima Zavin
1d8399bcd5
am 0b2dd95d: am 0c559a4b: am 98b3def2: Merge change I6261ab54 into eclair
...
Merge commit '0b2dd95d2ead61241688a121ae1c6a5092149ef6'
* commit '0b2dd95d2ead61241688a121ae1c6a5092149ef6':
Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
2009-10-13 17:02:02 -07:00
Mike Reed
ebe22aad09
am 8547ce6a: am bd5662a1: Merge change Ifd71653f into eclair-mr2
...
Merge commit '8547ce6adaf218ea77c3062902f0cedf0347aa9c'
* commit '8547ce6adaf218ea77c3062902f0cedf0347aa9c':
add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
2009-10-13 17:01:36 -07:00
Mike Lockwood
4905313775
am a7cdac03: am 5ad40971: am 6abf7c8f: Merge change Iad66a274 into eclair
...
Merge commit 'a7cdac0329d837a3f986a499f2c1a5fbe9bc8d7e'
* commit 'a7cdac0329d837a3f986a499f2c1a5fbe9bc8d7e':
Fix race condition in WindowManagerService.disableKeyguard()
2009-10-13 17:01:23 -07:00
Nick Pelly
b7e65b3876
am 132570cb: am 77df9d6e: am d301c904: Merge change I305c181c into eclair
...
Merge commit '132570cbf4715fa13d237f1255848caf0dbd9d79'
* commit '132570cbf4715fa13d237f1255848caf0dbd9d79':
Delay 500ms between each registering each SDP record using sdptool.
2009-10-13 17:01:09 -07:00
Dianne Hackborn
87ec4965d6
am 8cbafb83: am 7fa61063: am f836acf2: Merge change I067d55ea into eclair
...
Merge commit '8cbafb83b4d3eda68c9de2db359813c370d21cbe'
* commit '8cbafb83b4d3eda68c9de2db359813c370d21cbe':
Fix issue #2179931 : Power key to wake up frequently ignored when in dock app
2009-10-13 17:00:59 -07:00
Christoffer Gurell
8e14318b1a
am 78077455: am f555bf65: Merge change I4a4323c0 into eclair-mr2
...
Merge commit '78077455a89de6485f6d2223648e241ad7240ff6'
* commit '78077455a89de6485f6d2223648e241ad7240ff6':
Fixes scroll/measure bug in EditText
2009-10-13 17:00:49 -07:00
Patrick Scott
f40126c0f6
am 5a6d521d: am 656c037c: Fix the youtube placeholder.
...
Merge commit '5a6d521d9c348e35bb8b849d1fd5bea4db94a269'
* commit '5a6d521d9c348e35bb8b849d1fd5bea4db94a269':
Fix the youtube placeholder.
2009-10-13 16:59:49 -07:00
Cary Clark
4c62c89245
am 13d5b998: am 3e88ddc5: Select plugin objects with focusCandidate
...
Merge commit '13d5b998c876e7f8b98b9e9c7440aa66cab1099d'
* commit '13d5b998c876e7f8b98b9e9c7440aa66cab1099d':
Select plugin objects with focusCandidate
2009-10-13 16:59:39 -07:00
Zheng BaoZhong
d7e9d628e3
am 360f21cd: am a4adc798: Merge change I409d9b4a into eclair-mr2
...
Merge commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca'
* commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca':
Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
2009-10-13 16:59:28 -07:00
Jeff Hamilton
026e3ba496
am a4b0c0d0: am 5d93de73: am 6dc3f4e5: Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
...
Merge commit 'a4b0c0d00c80aa409ceb3f372cead2928fd4b601'
* commit 'a4b0c0d00c80aa409ceb3f372cead2928fd4b601':
Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
2009-10-13 16:59:15 -07:00
Fred Quintana
483aa99c52
am 0074e8f2: am a5e44bbd: am 083a50a3: Merge change I66693ea2 into eclair
...
Merge commit '0074e8f2e085cd84c40a6eb3dbf61dc29ed2cc8c'
* commit '0074e8f2e085cd84c40a6eb3dbf61dc29ed2cc8c':
fix sync exponential backoff for expedited syncs
2009-10-13 16:59:05 -07:00
Jack Palevich
a0bf115c44
am cd0d9603: am 1bb55501: Merge change I85f598e0 into eclair-mr2
...
Merge commit 'cd0d9603c3e54b484ec5046538f336f57a3678bf'
* commit 'cd0d9603c3e54b484ec5046538f336f57a3678bf':
Prevent transparent region from getting out of sync with Surface Flinger
2009-10-13 16:58:56 -07:00
Dianne Hackborn
ef23700741
am 81efcdfe: am 8a98a26a: am ee110be0: Fix issue #2179891 : Need to update 5.xml
...
Merge commit '81efcdfee658710bd267e6f335d7cf505224492b'
* commit '81efcdfee658710bd267e6f335d7cf505224492b':
Fix issue #2179891 : Need to update 5.xml
2009-10-13 16:58:40 -07:00
Romain Guy
443f77c0b5
am 27d84fb6: am ecc6f877: am 8eb955b9: Merge change I5e482bbc into eclair
...
Merge commit '27d84fb6161d3c6ce6f08ef48bf4681c334bef89'
* commit '27d84fb6161d3c6ce6f08ef48bf4681c334bef89':
Add new RenderScript sample: ImageProcessing.
2009-10-13 16:58:28 -07:00
Eric Fischer
869caf14e3
am 297c781b: (-s ours) am 8ec1ba6d: am c08efb27: (-s ours) Import revised translations. DO NOT MERGE
...
Merge commit '297c781b921e9f48bdbba5bc0a4abd3e12edb98e'
* commit '297c781b921e9f48bdbba5bc0a4abd3e12edb98e':
Import revised translations. DO NOT MERGE
2009-10-13 16:58:18 -07:00
Daisuke Miyakawa
486a419871
am a9a42a67: am ca103c16: Merge change I6ce46417 into eclair-mr2
...
Merge commit 'a9a42a673f62a01fad6d7b82ba8c5f6493760c78'
* commit 'a9a42a673f62a01fad6d7b82ba8c5f6493760c78':
Clean-up vCard code.
2009-10-13 16:53:00 -07:00
Grace Kloba
4363c4f23f
am 947a9157: am 94ab3b6d: Expose WebViewClient of WebView.
...
Merge commit '947a915743c9ece5dfb7e39e585d9ff372e57244'
* commit '947a915743c9ece5dfb7e39e585d9ff372e57244':
Expose WebViewClient of WebView.
2009-10-13 16:52:38 -07:00
Leon Scroggins
9f66b87444
am b3e3352f: am 70ca3c25: File upload.
...
Merge commit 'b3e3352fee7d2d81711f06c0bb37e91cb4db405a'
* commit 'b3e3352fee7d2d81711f06c0bb37e91cb4db405a':
File upload.
2009-10-13 16:51:00 -07:00
Android (Google) Code Review
6f361fa589
Merge change I3f59d859
...
* changes:
Reimport translations.
2009-10-13 19:50:02 -04:00
Daisuke Miyakawa
53d926bc40
am 403b5cd4: am 6e15a70c: Merge change I1fb066b0 into eclair-mr2
...
Merge commit '403b5cd405dee554bbd1a467112fc90cdf2af308'
* commit '403b5cd405dee554bbd1a467112fc90cdf2af308':
Rename VCardTest.java to VCardImportTest.java.
2009-10-13 14:29:09 -07:00
Ray Chen
2edcbce875
am 7c86fc06: am 23a2d92f: Merge change Ib01005ea into eclair-mr2
...
Merge commit '7c86fc066a010ed50877ee3066d542f873d762c2'
* commit '7c86fc066a010ed50877ee3066d542f873d762c2':
Avoid extracting EXIF data for non-JPEG images.
2009-10-13 14:28:59 -07:00
Andreas Huber
f2ed1ef4b7
am 861c462c: am 9b8f9477: Fixing the build.
...
Merge commit '861c462c521db2ca54924c3e6a8563784db98b53'
* commit '861c462c521db2ca54924c3e6a8563784db98b53':
Fixing the build.
2009-10-13 14:28:45 -07:00
Andreas Huber
f0b7d56b61
am e1ba4226: am 936fff36: Merge change Ib64cab41 into eclair-mr2
...
Merge commit 'e1ba422636937ee1ca84938d018282344d319543'
* commit 'e1ba422636937ee1ca84938d018282344d319543':
Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
2009-10-13 14:28:35 -07:00
Robert Greenwalt
4a4ca924df
am c2bc31b4: am 2515cf85: am 98e0b146: Make PhoneStateListeners not call TelephonyManager
...
Merge commit 'c2bc31b45e14b1ea261492ee531ed5bb2aac12d4'
* commit 'c2bc31b45e14b1ea261492ee531ed5bb2aac12d4':
2009-10-13 14:27:25 -07:00
Grace Kloba
fc95d8082f
am 4496a3fe: am a1c0506e: am 1184313c: Setting WebCore cache limit depending on the memory class.
...
Merge commit '4496a3fecabb26671e745c2b6edcb54989f8c045'
* commit '4496a3fecabb26671e745c2b6edcb54989f8c045':
2009-10-13 14:27:14 -07:00
David Krause
3e1b0407e7
am a614b948: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
...
Merge commit 'a614b948e18189adfe8e2553754db574ecb3fd7a'
* commit 'a614b948e18189adfe8e2553754db574ecb3fd7a':
Make PhoneStateListeners not call TelephonyManager
Setting WebCore cache limit depending on the memory class.
2009-10-13 14:27:04 -07:00
Dan Egnor
7ac4ff238b
am 371071c1: am e9d8f545: am 6903d5ce: Merge change Iee649a81 into eclair
...
Merge commit '371071c195138312a8829c198b24b7cb41bf7bc2'
* commit '371071c195138312a8829c198b24b7cb41bf7bc2':
2009-10-13 12:11:40 -07:00
Jeff Sharkey
2a1070fdac
am 6815a67c: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
...
Merge commit '6815a67c5322cbde7768330fd12882d955abdd2a'
* commit '6815a67c5322cbde7768330fd12882d955abdd2a':
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
2009-10-13 12:11:28 -07:00
Daisuke Miyakawa
ec982b2dfb
am a6a96cf4: am c93b88cf: Remove redundant comment. As of now, we cannot guarantee anything toward external developers.
...
Merge commit 'a6a96cf40e6e5349715ca6d2c81602d72d37da24'
* commit 'a6a96cf40e6e5349715ca6d2c81602d72d37da24':
Remove redundant comment. As of now, we cannot guarantee anything toward external developers.
2009-10-13 12:11:11 -07:00
Daisuke Miyakawa
518bd9f69b
am 258bc9cb: am 5a016488: Merge commit \'refs/changes/08/29008/8\' of ssh://dmiyakawa@android-git.corp.google.com:29418/platform/frameworks/base into cleanup_import
...
Merge commit '258bc9cb44f637d9ea1377d81a995bec2bd10a1d'
* commit '258bc9cb44f637d9ea1377d81a995bec2bd10a1d':
Develop ContentResolver-based unit tests for vCard importer and fix vCard code
2009-10-13 12:11:01 -07:00
Jim Miller
ccdbfb1897
am 65f0f97a: am b1fdb1d3: am ad60e7fe: Merge change I9485aec1 into eclair
...
Merge commit '65f0f97aa700df38a6183b97f7bb8c6f82367285'
* commit '65f0f97aa700df38a6183b97f7bb8c6f82367285':
2009-10-13 12:10:41 -07:00
Dianne Hackborn
fc7542bf5c
am 43ebb2d9: am 81aaf56f: am 2c6c5e6e: Fix issue #2176944 : Need API so browser, others can determine memory size of device
...
Merge commit '43ebb2d91518cac40c43ceb098fcf11b92959d31'
* commit '43ebb2d91518cac40c43ceb098fcf11b92959d31':
2009-10-13 12:10:32 -07:00
Dianne Hackborn
6e51d606e8
am 198dcc9d: am 0c35e6ff: am d10d02f5: Merge change I490e01ba into eclair
...
Merge commit '198dcc9d6f6ce1d6582d67e342f3833af4afe33b'
* commit '198dcc9d6f6ce1d6582d67e342f3833af4afe33b':
2009-10-13 12:10:23 -07:00
Dianne Hackborn
d8db22573d
am d3332dd1: am 479e8004: am 89becd79: Fix issue #2177262 : Improve animations
...
Merge commit 'd3332dd1135571723c891a672fe51b9b27f66282'
* commit 'd3332dd1135571723c891a672fe51b9b27f66282':
2009-10-13 12:10:13 -07:00
James Dong
210da3448c
am 6195432b: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
...
Merge commit '6195432b6fde3cda4bc7e2406c8f2975795933a7'
* commit '6195432b6fde3cda4bc7e2406c8f2975795933a7':
Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
Fix issue #2176944 : Need API so browser, others can determine memory size of device
Fix issue #2177262 : Improve animations
Fix issue #2174566 : HOT STABILITY: NPE in activity manager
2009-10-13 12:10:02 -07:00
Dianne Hackborn
72a3046cc3
am 68f857cd: am dc76d696: am 9e2562b8: Merge change I88c6e267 into eclair
...
Merge commit '68f857cd442c2e9b91ffb5111a5fbae7ac72edc8'
* commit '68f857cd442c2e9b91ffb5111a5fbae7ac72edc8':
2009-10-13 12:06:59 -07:00
Nick Pelly
6c49f9c08a
am eb772880: am 59778b3c: am db7ae10d: (-s ours) Remove STOPSHIP BT logging.
...
Merge commit 'eb772880e3e0ca472fc632af19543a8b17a03598'
* commit 'eb772880e3e0ca472fc632af19543a8b17a03598':
2009-10-13 12:06:50 -07:00