10564 Commits

Author SHA1 Message Date
Android (Google) Code Review
bd5662a1a2 Merge change Ifd71653f into eclair-mr2
* changes:
  add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
2009-10-12 14:52:45 -04:00
Mike Reed
fd71653f6a add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs 2009-10-12 14:42:56 -04:00
Mike Lockwood
a7cdac0329 am 5ad40971: am 6abf7c8f: Merge change Iad66a274 into eclair
Merge commit '5ad409719809b4070ba0bb36c5326c7cac7c75ea' into eclair-mr2-plus-aosp

* commit '5ad409719809b4070ba0bb36c5326c7cac7c75ea':
  Fix race condition in WindowManagerService.disableKeyguard()
2009-10-12 11:26:58 -07:00
Mike Lockwood
5ad4097198 am 6abf7c8f: Merge change Iad66a274 into eclair
Merge commit '6abf7c8fccf1430bf5d730592b79d77fbeccfe5b' into eclair-mr2

* commit '6abf7c8fccf1430bf5d730592b79d77fbeccfe5b':
  Fix race condition in WindowManagerService.disableKeyguard()
2009-10-12 11:21:28 -07:00
Nick Pelly
132570cbf4 am 77df9d6e: am d301c904: Merge change I305c181c into eclair
Merge commit '77df9d6e0ca56a34c66a1e30e9696085ddbd9038' into eclair-mr2-plus-aosp

* commit '77df9d6e0ca56a34c66a1e30e9696085ddbd9038':
  Delay 500ms between each registering each SDP record using sdptool.
2009-10-12 11:21:12 -07:00
Dianne Hackborn
8cbafb83b4 am 7fa61063: am f836acf2: Merge change I067d55ea into eclair
Merge commit '7fa610638b09f2a4a29d7df1b16d2fe686b5e5e6' into eclair-mr2-plus-aosp

* commit '7fa610638b09f2a4a29d7df1b16d2fe686b5e5e6':
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
2009-10-12 11:21:04 -07:00
Christoffer Gurell
78077455a8 am f555bf65: Merge change I4a4323c0 into eclair-mr2
Merge commit 'f555bf65e18407314f569c1c767e5334cf3f56bf' into eclair-mr2-plus-aosp

* commit 'f555bf65e18407314f569c1c767e5334cf3f56bf':
  Fixes scroll/measure bug in EditText
2009-10-12 11:20:56 -07:00
Android (Google) Code Review
6abf7c8fcc Merge change Iad66a274 into eclair
* changes:
  Fix race condition in WindowManagerService.disableKeyguard()
2009-10-12 14:14:44 -04:00
Nick Pelly
77df9d6e0c am d301c904: Merge change I305c181c into eclair
Merge commit 'd301c90446644f63cda9b9263f83332676065bb4' into eclair-mr2

* commit 'd301c90446644f63cda9b9263f83332676065bb4':
  Delay 500ms between each registering each SDP record using sdptool.
2009-10-12 11:11:38 -07:00
Dianne Hackborn
7fa610638b am f836acf2: Merge change I067d55ea into eclair
Merge commit 'f836acf241f10d943d72d439fa425fda73a6d56b' into eclair-mr2

* commit 'f836acf241f10d943d72d439fa425fda73a6d56b':
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
2009-10-12 11:11:30 -07:00
Android (Google) Code Review
d301c90446 Merge change I305c181c into eclair
* changes:
  Delay 500ms between each registering each SDP record using sdptool.
2009-10-12 14:05:44 -04:00
Android (Google) Code Review
f836acf241 Merge change I067d55ea into eclair
* changes:
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
2009-10-12 14:04:31 -04:00
Android (Google) Code Review
f555bf65e1 Merge change I4a4323c0 into eclair-mr2
* changes:
  Fixes scroll/measure bug in EditText
2009-10-12 13:31:19 -04:00
Christoffer Gurell
4a4323c08d Fixes scroll/measure bug in EditText
Bug and fix described in:
http://code.google.com/p/android/issues/detail?id=4184
2009-10-12 10:29:45 -07:00
Nick Pelly
bc1fc05c1b Delay 500ms between each registering each SDP record using sdptool.
This is to workaround an issue where SDP records will fail to register using
sdptool. When we run SystemService.start() it forks sdptool, so if we do this
four times in a row these forked processes can run in parallel, and one or
more of them fails. There is probably some thready safety issue in sdptool
or Bluez that makes it unsafe to run sdptool in parallel.

As a workaround, delay 500ms between each run of sdptool to register SDP
records when starting Bluetooth.

Before this fix it was easy to reproduce problems with service record
registration. If you turn BT off/on multiple times you can see that sometimes
one or more service records are missing. Repro rate is about 20% in my tests.
Result is that remote devices cannot connect to the missing service.

After this fix I am unable to reproduce any missing SDP records, after 30+
cycles of BT on/off. Motorola BT team also ran stress tests overnight with this
fix and were unable to reproduce the missing SDP records.

This is a low risk fix. It does delay some records from being registered
by an additional 1.5 seconds (on top of the 3 second delay we already had),
so if you try and very quickly connect a BT service after turning BT on it
won't work the first time.

Do not merge. (I will use a less hacky fix for MR2/Master)

Change-Id: I305c181c3194e8ce25e3825320cc2e1ef6d3d3cc
Bug: 2180800
DrNo: eastham
Joke: Why can't you play cards in the jungle? Because there's too many cheetas!
2009-10-12 10:26:25 -07:00
Patrick Scott
5a6d521d9c am 656c037c: Fix the youtube placeholder.
Merge commit '656c037c8005be31b87dd87de876c3d4f632609c' into eclair-mr2-plus-aosp

* commit '656c037c8005be31b87dd87de876c3d4f632609c':
  Fix the youtube placeholder.
2009-10-12 10:25:57 -07:00
Cary Clark
13d5b998c8 am 3e88ddc5: Select plugin objects with focusCandidate
Merge commit '3e88ddc5df80e4dbc682b193a573b35110d9618d' into eclair-mr2-plus-aosp

* commit '3e88ddc5df80e4dbc682b193a573b35110d9618d':
  Select plugin objects with focusCandidate
2009-10-12 10:25:27 -07:00
Zheng BaoZhong
360f21cdfc am a4adc798: Merge change I409d9b4a into eclair-mr2
Merge commit 'a4adc7981ffc353d621f78db18bd6e5a8afcb72f' into eclair-mr2-plus-aosp

* commit 'a4adc7981ffc353d621f78db18bd6e5a8afcb72f':
  Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
2009-10-12 10:24:24 -07:00
Jeff Hamilton
a4b0c0d00c am 5d93de73: am 6dc3f4e5: Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit '5d93de7393bf01095e79af0f3586930ddd9ffeeb' into eclair-mr2-plus-aosp

* commit '5d93de7393bf01095e79af0f3586930ddd9ffeeb':
  Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
2009-10-12 10:24:16 -07:00
Fred Quintana
0074e8f2e0 am a5e44bbd: am 083a50a3: Merge change I66693ea2 into eclair
Merge commit 'a5e44bbd3788bae2b38dfb7771cb021f8541fe1f' into eclair-mr2-plus-aosp

* commit 'a5e44bbd3788bae2b38dfb7771cb021f8541fe1f':
  fix sync exponential backoff for expedited syncs
2009-10-12 10:24:09 -07:00
Jack Palevich
cd0d9603c3 am 1bb55501: Merge change I85f598e0 into eclair-mr2
Merge commit '1bb5550107eae60993dc35f2e917cb664f841255' into eclair-mr2-plus-aosp

* commit '1bb5550107eae60993dc35f2e917cb664f841255':
  Prevent transparent region from getting out of sync with Surface Flinger
2009-10-12 10:23:36 -07:00
Dianne Hackborn
81efcdfee6 am 8a98a26a: am ee110be0: Fix issue #2179891: Need to update 5.xml
Merge commit '8a98a26aa28381bb1dcbf8bbf57706d26e3349bf' into eclair-mr2-plus-aosp

* commit '8a98a26aa28381bb1dcbf8bbf57706d26e3349bf':
  Fix issue #2179891: Need to update 5.xml
2009-10-12 10:23:24 -07:00
Romain Guy
27d84fb616 am ecc6f877: am 8eb955b9: Merge change I5e482bbc into eclair
Merge commit 'ecc6f8773ab4517308b5a65fd32825934d623aaf' into eclair-mr2-plus-aosp

* commit 'ecc6f8773ab4517308b5a65fd32825934d623aaf':
  Add new RenderScript sample: ImageProcessing.
2009-10-12 10:22:47 -07:00
Eric Fischer
297c781b92 am 8ec1ba6d: am c08efb27: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '8ec1ba6db56c54b8294eb7ebefb6d7d4133a81cc' into eclair-mr2-plus-aosp

* commit '8ec1ba6db56c54b8294eb7ebefb6d7d4133a81cc':
  Import revised translations.  DO NOT MERGE
2009-10-12 10:22:39 -07:00
Patrick Scott
656c037c80 Fix the youtube placeholder.
The table was causing some problems if the image was too big.

Bug: 2175973
2009-10-12 12:52:33 -04:00
Cary Clark
3e88ddc5df Select plugin objects with focusCandidate
Select plugin using focusCandidate rather than cursor
calls. This allows the detecting plugin objects that
have received focus but don't have the cursor ring
on them.

Remove 'inval rect' from debugging printfs, since it
happens a lot, and allow 'request keyboard' to be
visible.
2009-10-12 09:40:20 -04:00
Mike Lockwood
dd8846886a Fix race condition in WindowManagerService.disableKeyguard()
TokenWatcher.acquire() synchronizes on mTokens, not this,
so we need to synchronize on mKeyguardDisabled in disableKeyguard()
to synchronize properly with reenableKeyguard().

This should fix b/2180142 (Stuck in enable keyguard when receiving phone call)

Change-Id: Iad66a2748c7fbf2c516fdb8a00988696719ea80c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-11 17:07:55 -04:00
Android (Google) Code Review
a4adc7981f Merge change I409d9b4a into eclair-mr2
* changes:
  Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
2009-10-10 16:28:58 -04:00
Zheng BaoZhong
038e315cde Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
bug b/2178462

Change-Id: I409d9b4a163299c3383ec092cd2368a9d24236cb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-10 16:26:33 -04:00
Jeff Hamilton
5d93de7393 am 6dc3f4e5: Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e' into eclair-mr2

* commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e':
  Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
2009-10-10 11:25:39 -07:00
Jeff Hamilton
6dc3f4e553 Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Change-Id: I45af1fe80f6f93a1db8389600dc780af9cedf22c
2009-10-10 12:50:25 -05:00
Fred Quintana
a5e44bbd37 am 083a50a3: Merge change I66693ea2 into eclair
Merge commit '083a50a394915b562ad53be9fd8ec7524e3db21c' into eclair-mr2

* commit '083a50a394915b562ad53be9fd8ec7524e3db21c':
  fix sync exponential backoff for expedited syncs
2009-10-09 21:15:55 -07:00
Android (Google) Code Review
083a50a394 Merge change I66693ea2 into eclair
* changes:
  fix sync exponential backoff for expedited syncs
2009-10-10 00:10:29 -04:00
Dima Zavin
6261ab5422 Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
This reverts commit ed5ecdba36648973be3033a045e2ece8bf039e4a.
2009-10-09 18:23:08 -07:00
Android (Google) Code Review
1bb5550107 Merge change I85f598e0 into eclair-mr2
* changes:
  Prevent transparent region from getting out of sync with Surface Flinger
2009-10-09 20:40:26 -04:00
Dianne Hackborn
8a98a26aa2 am ee110be0: Fix issue #2179891: Need to update 5.xml
Merge commit 'ee110be02256b816ac6d863e39cb8b11b8071baa' into eclair-mr2

* commit 'ee110be02256b816ac6d863e39cb8b11b8071baa':
  Fix issue #2179891: Need to update 5.xml
2009-10-09 17:38:59 -07:00
Dianne Hackborn
aa80b60b59 Fix issue #2179931: Power key to wake up frequently ignored when in dock app
The dock app is forcing the screen to a particular brightness level.  This
causes the window manager to often call into the power manager with the
new brightness.  This causes us to go in to updateLightsLocked() to figure
out and apply the real brightness to use.  When the screen is off the
real brightness always remains 0, but even if it didn't change from the
last one we would start an animation which would when done put the system
to sleep and fight with the user trying to turn the device on.

Now, if the new target brightness is the same as the last one, we leave the
animation as-is -- either running or not as appropriate.

Change-Id: I067d55ea2b39e294c5d5291587a4d8727c0b8083
2009-10-09 17:38:26 -07:00
Jack Palevich
61a6e68918 Prevent transparent region from getting out of sync with Surface Flinger
The ViewRoot is responsible for calculating the current view's surface's
transparent region and reporting this to the window server, which in
turn notifies Surface Flinger.

To minimize cross-process traffic, ViewRoot keeps track of the
most recent transparent region that it has reported to the window
server, and only sends updates when the region shape changes.

ViewRoot is effectively shadowing the internal state of the window
server, and usually this works fine, because ViewRoot is usually the
only thing that changes this value.

But when the surface is recreated, the window server resets the
transparent region to empty. So in order to properly update the window
server we need to reset our copy of its state to empty too.

Fixes issue #2133090: GL Gears runs at half speed in some cases
2009-10-09 17:37:50 -07:00
Dianne Hackborn
ee110be022 Fix issue #2179891: Need to update 5.xml
Copied current.xml to 5.xml.

Change-Id: I5eaa806eef9a9a3135b021d7db179325ff7663fc
2009-10-09 16:41:40 -07:00
Fred Quintana
66693ea208 fix sync exponential backoff for expedited syncs 2009-10-09 16:32:02 -07:00
Romain Guy
ecc6f8773a am 8eb955b9: Merge change I5e482bbc into eclair
Merge commit '8eb955b934c49ce814bce1a84bc995eef849051d' into eclair-mr2

* commit '8eb955b934c49ce814bce1a84bc995eef849051d':
  Add new RenderScript sample: ImageProcessing.
2009-10-09 16:27:35 -07:00
Eric Fischer
8ec1ba6db5 am c08efb27: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4' into eclair-mr2

* commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4':
  Import revised translations.  DO NOT MERGE
2009-10-09 16:27:19 -07:00
Android (Google) Code Review
8eb955b934 Merge change I5e482bbc into eclair
* changes:
  Add new RenderScript sample: ImageProcessing.
2009-10-09 19:07:12 -04:00
Romain Guy
d7fa122dfe Add new RenderScript sample: ImageProcessing.
Change-Id: I5e482bbc34911c940a3a74258f8f8549b1939bc4
2009-10-09 16:05:25 -07:00
Eric Fischer
c08efb2712 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-09 15:33:15 -07:00
Daisuke Miyakawa
a9a42a673f am ca103c16: Merge change I6ce46417 into eclair-mr2
Merge commit 'ca103c16d80aba1a9535e2eb4e13283258426395' into eclair-mr2-plus-aosp

* commit 'ca103c16d80aba1a9535e2eb4e13283258426395':
  Clean-up vCard code.
2009-10-09 13:38:29 -07:00
Android (Google) Code Review
ca103c16d8 Merge change I6ce46417 into eclair-mr2
* changes:
  Clean-up vCard code.
2009-10-09 16:31:33 -04:00
Daisuke Miyakawa
021de73623 Clean-up vCard code.
Note that refactor is still on-going. Some changes done now may be
reverted in the future.

- Move reusable constants from VCardComposer to Constants.
- Make ContactStruct appropriately refers to Constants.
- Move PBAP-related code at the bottom of vCard composer
- Remove some redundant code.

Internal issue number: 2160039
2009-10-09 13:28:05 -07:00
Grace Kloba
947a915743 am 94ab3b6d: Expose WebViewClient of WebView.
Merge commit '94ab3b6d0e9a5a914c7706ed1888c9d27756f7e4' into eclair-mr2-plus-aosp

* commit '94ab3b6d0e9a5a914c7706ed1888c9d27756f7e4':
  Expose WebViewClient of WebView.
2009-10-09 12:53:37 -07:00
Grace Kloba
94ab3b6d0e Expose WebViewClient of WebView. 2009-10-09 11:57:05 -07:00