5313 Commits

Author SHA1 Message Date
Grace Kloba
58def690a8 If openOrCreateDatabase() throws an exception, delete
the old db and re-do it. If it still fails, something
bad happens, like the directory may have the different
permission. Let it throw as WebView needs the db.

Fix http://b/issue?id=2179339
2009-10-13 12:57:08 -07:00
Leon Scroggins
7fd752af75 am 5a4f64fc: Merge change Id5ba82a1 into eclair-mr2
Merge commit '5a4f64fcbf0382f33e9f79e6d0497113b972690e' into eclair-mr2-plus-aosp

* commit '5a4f64fcbf0382f33e9f79e6d0497113b972690e':
  Prevent getFile from copying when the file is too large.
2009-10-13 12:17:53 -07:00
Android (Google) Code Review
5a4f64fcbf Merge change Id5ba82a1 into eclair-mr2
* changes:
  Prevent getFile from copying when the file is too large.
2009-10-13 15:09:18 -04:00
Derek Sollenberger
b4b5f2af45 am 14592861: Merge change I3dafca18 into eclair-mr2
Merge commit '145928617af865e867f6f27e99173d2a756b9dfd' into eclair-mr2-plus-aosp

* commit '145928617af865e867f6f27e99173d2a756b9dfd':
  Enabling plugin surfaces to update their position in the UI.
2009-10-13 11:47:49 -07:00
Android (Google) Code Review
145928617a Merge change I3dafca18 into eclair-mr2
* changes:
  Enabling plugin surfaces to update their position in the UI.
2009-10-13 14:39:37 -04:00
Leon Scroggins
d5ba82a1fe Prevent getFile from copying when the file is too large.
Since the caller expects the data to fit within a certain amount of
space, do not copy into the buffer if the data exceeds that space.

Requires a change to external/webkit
2009-10-13 14:23:56 -04:00
Dave Sparks
d6e86a687d am 7d4acc53: am 69e2ef47: Merge change I9f93ce61 into eclair
Merge commit '7d4acc5316c080d8e9787d2a7c84e2a2500b85f8' into eclair-mr2-plus-aosp

* commit '7d4acc5316c080d8e9787d2a7c84e2a2500b85f8':
  Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 10:03:33 -07:00
Dave Sparks
7d4acc5316 am 69e2ef47: Merge change I9f93ce61 into eclair
Merge commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42' into eclair-mr2

* commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42':
  Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 09:56:26 -07:00
Derek Sollenberger
3dafca1842 Enabling plugin surfaces to update their position in the UI. 2009-10-13 11:45:47 -04:00
Android (Google) Code Review
69e2ef473c Merge change I9f93ce61 into eclair
* changes:
  Throttle camera preview frames to the app. Bug 2180302.
2009-10-13 06:02:59 -04:00
Dave Sparks
a6118c6383 Throttle camera preview frames to the app. Bug 2180302.
With higher frame rates and larger preview frames, we can easily
flood the application with too much data. This patch fakes the
old camera preview mode by doing continuous one-shot frames.
After the previous frame is handled, if the application hasn't
cleared the preview callback, we start another one-shot preview
frame. With this change, the application should never have more
than one preview frame unless it is explicitly saving references
to them.

	modified:   core/java/android/hardware/Camera.java
2009-10-13 02:52:00 -07:00
Grace Kloba
4d915e00dc am d5ad08bd: am 2e778c17: Merge change I124356f6 into eclair
Merge commit 'd5ad08bd4230c2f5d58969c624c39a3f5a2019d1' into eclair-mr2-plus-aosp

* commit 'd5ad08bd4230c2f5d58969c624c39a3f5a2019d1':
  Continue caching "POST" result so that we won't get
2009-10-12 18:41:22 -07:00
Grace Kloba
d5ad08bd42 am 2e778c17: Merge change I124356f6 into eclair
Merge commit '2e778c176d17c295f475141bddda9dca5cd65fce' into eclair-mr2

* commit '2e778c176d17c295f475141bddda9dca5cd65fce':
  Continue caching "POST" result so that we won't get
2009-10-12 18:36:17 -07:00
Grace Kloba
124356f630 Continue caching "POST" result so that we won't get
the resubmission warning when back to Google search result.

Fix http://b/issue?id=1490379
Break/reopen http://b/issue?id=1980031
2009-10-12 17:39:50 -07:00
Ken Shirriff
3b000937f5 Add "deleted" row to Events table.
This will replace the DeletedEvents table when moving Calendar to the
new sync framework.
2009-10-12 17:37:42 -07:00
Daisuke Miyakawa
4fce5c81d5 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 '7c6770c26ba819bcad3d9522e046f9d1fdf9e222' into eclair-mr2-plus-aosp

* commit '7c6770c26ba819bcad3d9522e046f9d1fdf9e222':
  Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which
2009-10-12 15:58:32 -07:00
Daisuke Miyakawa
7c6770c26b 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.

issue number: 2180800
2009-10-12 15:14:09 -07:00
Daisuke Miyakawa
74a2d09cba am 347daf3a: Merge change I2a52a60a into eclair-mr2
Merge commit '347daf3a9802b2a4184ff8aa90b4af6c5de79ab7' into eclair-mr2-plus-aosp

* commit '347daf3a9802b2a4184ff8aa90b4af6c5de79ab7':
  Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
2009-10-12 14:12:17 -07:00
Android (Google) Code Review
347daf3a98 Merge change I2a52a60a into eclair-mr2
* changes:
  Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
2009-10-12 17:03:12 -04:00
Daisuke Miyakawa
ba2b21bee8 Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
In order to share the logic between tests for importer and those for exporter,
PropertyNodesVerifier is now a separated class and drastically modified.
Now the class accept "unordered" expected PropertyNode objects, which allows vCard
composer to not care the exact order of each elements.

MockCursor is added, which may be added into the public API in the future, but in
the test directory for now.
Another MockContentProvider is (temporarily) developed so that it can be accepted by
MockContentResolver#addProvider(), which does not allow IContentProvider and its
descendants but only exact ContentProvider, while the original MockContentProvider in
android.test.mock.MockContentProvider implements IContentProvider.

The test development is still on-going, but this test suffices minimal requirement of
vCard tests.

Internal issue number: 2160039
2009-10-12 13:42:42 -07:00
Mike Reed
8547ce6ada am bd5662a1: Merge change Ifd71653f into eclair-mr2
Merge commit 'bd5662a1a2e74f1be1e0a0fb4858835caf10c315' into eclair-mr2-plus-aosp

* commit 'bd5662a1a2e74f1be1e0a0fb4858835caf10c315':
  add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
2009-10-12 12:00:46 -07:00
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
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
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
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
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
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
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
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
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
Fred Quintana
66693ea208 fix sync exponential backoff for expedited syncs 2009-10-09 16:32:02 -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