4099 Commits

Author SHA1 Message Date
Dianne Hackborn
c4f52bd755 am 7e5c5d97: am 0c3154d3: Fix issue #2163654: deadlock, runtime restart
Merge commit '7e5c5d975297ef76ae6640e06505a19fa8c0270e' into eclair-mr2-plus-aosp

* commit '7e5c5d975297ef76ae6640e06505a19fa8c0270e':
  Fix issue #2163654: deadlock, runtime restart
2009-10-07 11:52:39 -07:00
Dianne Hackborn
7e5c5d9752 am 0c3154d3: Fix issue #2163654: deadlock, runtime restart
Merge commit '0c3154d3fc54a1b3d8358a2932042cca729327b9' into eclair-mr2

* commit '0c3154d3fc54a1b3d8358a2932042cca729327b9':
  Fix issue #2163654: deadlock, runtime restart
2009-10-07 11:41:19 -07:00
Dianne Hackborn
0c3154d3fc Fix issue #2163654: deadlock, runtime restart
Don't hold a lock when the activity thread is telling the activity manager
to release a provider.

This requires that the activity manager now keep a reference count on the
providers, because without the lock it is possible for activity thread to
call in to request the provider again before it has finished telling
about the release.

Change-Id: I5f912903891f4edae85e28819d4e6f14b8f2e688
2009-10-07 11:10:33 -07:00
Cary Clark
fface18d25 am 5da9aeb4: reset webTextView size if focus bounds changes
Merge commit '5da9aeb4351ed02b05f15c11e34673ab38103dd8' into eclair-mr2-plus-aosp

* commit '5da9aeb4351ed02b05f15c11e34673ab38103dd8':
  reset webTextView size if focus bounds changes
2009-10-07 08:27:42 -07:00
Cary Clark
5da9aeb435 reset webTextView size if focus bounds changes
When the focus bounds is changed by webkit, reflect that
change on the UI side in the WebTextView. On the WebCore
side, add the focus-changed state to the Draw record,
which is sent whenever a new picture is recorded.

On the WebView side, set a bit when receiving the Draw
record, and check that bit when the picture is first drawn.
This additional delay is required so that the bit isn't
checked until after the new nav cache is swapped in.

If the bit is set when the draw occurs, clear it, and
set up the WebTextView's bounds.

companion change in external/webkit
fixes http://b/issue?id=2118781
2009-10-07 08:35:40 -04:00
Bjorn Bringert
ef8e6b5672 am 19400067: am 4625758d: Merge change I2c5f1e76 into eclair
Merge commit '19400067b2bca066255118315877125d1e623cad' into eclair-mr2-plus-aosp

* commit '19400067b2bca066255118315877125d1e623cad':
  Fix back button handling in ACTV
2009-10-06 23:05:33 -07:00
Fred Quintana
7fc5e5ab6d am f9f7718f: am f038004f: changes from Sync Manager API Review: bug 2164262
Merge commit 'f9f7718f6493ff57e57c7c278311cbe2a0a4042c' into eclair-mr2-plus-aosp

* commit 'f9f7718f6493ff57e57c7c278311cbe2a0a4042c':
  changes from Sync Manager API Review: bug 2164262
2009-10-06 23:00:47 -07:00
Bjorn Bringert
19400067b2 am 4625758d: Merge change I2c5f1e76 into eclair
Merge commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd' into eclair-mr2

* commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd':
  Fix back button handling in ACTV
2009-10-06 22:59:59 -07:00
Android (Google) Code Review
4625758d0b Merge change I2c5f1e76 into eclair
* changes:
  Fix back button handling in ACTV
2009-10-07 01:55:33 -04:00
Fred Quintana
f9f7718f64 am f038004f: changes from Sync Manager API Review: bug 2164262
Merge commit 'f038004f4a5e4fab18df9c87573ba1e82790c30f' into eclair-mr2

* commit 'f038004f4a5e4fab18df9c87573ba1e82790c30f':
  changes from Sync Manager API Review: bug 2164262
2009-10-06 22:55:12 -07:00
Fred Quintana
f038004f4a changes from Sync Manager API Review: bug 2164262 2009-10-06 22:30:48 -07:00
Ray Chen
2f2634e5be am 13ed5750: Add group id to getThumbnail and cancelThumbnailRequest API.
Merge commit '13ed5750ba515c3b4345937c7a11667a90cb1265' into eclair-mr2-plus-aosp

* commit '13ed5750ba515c3b4345937c7a11667a90cb1265':
  Add group id to getThumbnail and cancelThumbnailRequest API.
2009-10-06 16:27:10 -07:00
Ray Chen
13ed5750ba Add group id to getThumbnail and cancelThumbnailRequest API. 2009-10-06 16:13:05 -07:00
Robert Greenwalt
2a9b411d4e am e8830120: am 92b5caa4: Merge change Id8df149c into eclair
Merge commit 'e8830120c8e416a26520dfbbd0e386e77255dbda' into eclair-mr2-plus-aosp

* commit 'e8830120c8e416a26520dfbbd0e386e77255dbda':
  Turn some logging back on in ConnectionManager
2009-10-06 15:52:53 -07:00
Robert Greenwalt
e8830120c8 am 92b5caa4: Merge change Id8df149c into eclair
Merge commit '92b5caa4e21d48db6efeddba532d1546c6e686b1' into eclair-mr2

* commit '92b5caa4e21d48db6efeddba532d1546c6e686b1':
  Turn some logging back on in ConnectionManager
2009-10-06 15:40:27 -07:00
Jim Miller
e15dc6e19f am ca4efac9: am f65161f1: Merge change If933b13d into eclair
Merge commit 'ca4efac94f69fca2508c1402851550ad8638ed7f' into eclair-mr2-plus-aosp

* commit 'ca4efac94f69fca2508c1402851550ad8638ed7f':
  Fix for 2161835: Tweaks to rotary lock screen:
2009-10-06 15:18:40 -07:00
Wu-cheng Li
3616d15451 am 80fff7a5: am 962f2536: Merge change I547cff66 into eclair
Merge commit '80fff7a5897a6b2045d9382da73d7df167c7891a' into eclair-mr2-plus-aosp

* commit '80fff7a5897a6b2045d9382da73d7df167c7891a':
  Add zoom functions and sendCommand.
2009-10-06 14:50:50 -07:00
Fred Quintana
7a5262a620 am 72fc14e8: am f83d9b3f: fix build breakage
Merge commit '72fc14e874b53580420649b547c5fce1a8edc99c' into eclair-mr2-plus-aosp

* commit '72fc14e874b53580420649b547c5fce1a8edc99c':
  fix build breakage
2009-10-06 14:50:45 -07:00
Fred Quintana
11aaaa70b7 am 77a7bdce: am 5bba632d: - hide Entity and all its references - remove updateEntity and insertEntity, since they are not used - add the RawContacts.Entity class, which is used in lieu of the android.content.Entity
Merge commit '77a7bdce65977539654d60d5d7e286d7ae84dd4c' into eclair-mr2-plus-aosp

* commit '77a7bdce65977539654d60d5d7e286d7ae84dd4c':
  - hide Entity and all its references
2009-10-06 14:49:56 -07:00
Suchi Amalapurapu
5a535026bf am ef3c63ad: am 5163cd6d: Merge change I5be3d603 into eclair
Merge commit 'ef3c63ad20c4c45c0ae1748a67b5f33d26415938' into eclair-mr2-plus-aosp

* commit 'ef3c63ad20c4c45c0ae1748a67b5f33d26415938':
  Make sdk version and code names static finals in PackageParser.
2009-10-06 14:49:35 -07:00
Android (Google) Code Review
92b5caa4e2 Merge change Id8df149c into eclair
* changes:
  Turn some logging back on in ConnectionManager
2009-10-06 17:38:03 -04:00
Jim Miller
ca4efac94f am f65161f1: Merge change If933b13d into eclair
Merge commit 'f65161f159db3d140c62f56d43e732c332af7773' into eclair-mr2

* commit 'f65161f159db3d140c62f56d43e732c332af7773':
  Fix for 2161835: Tweaks to rotary lock screen:
2009-10-06 14:37:04 -07:00
Android (Google) Code Review
f65161f159 Merge change If933b13d into eclair
* changes:
  Fix for 2161835: Tweaks to rotary lock screen:
2009-10-06 17:34:17 -04:00
Robert Greenwalt
d8df149cfb Turn some logging back on in ConnectionManager
Trimmed a bunch of logging out, but turned it on so we get the critical stuff.

bug: 2168291
2009-10-06 14:12:53 -07:00
Wu-cheng Li
80fff7a589 am 962f2536: Merge change I547cff66 into eclair
Merge commit '962f253665e0c5cc8a29de9e59ce3992dad02440' into eclair-mr2

* commit '962f253665e0c5cc8a29de9e59ce3992dad02440':
  Add zoom functions and sendCommand.
2009-10-06 13:37:57 -07:00
Fred Quintana
72fc14e874 am f83d9b3f: fix build breakage
Merge commit 'f83d9b3fcd74f2528b0acc74185d2d7bdd716942' into eclair-mr2

* commit 'f83d9b3fcd74f2528b0acc74185d2d7bdd716942':
  fix build breakage
2009-10-06 13:37:52 -07:00
Android (Google) Code Review
962f253665 Merge change I547cff66 into eclair
* changes:
  Add zoom functions and sendCommand.
2009-10-06 16:32:44 -04:00
Wu-cheng Li
36f68b8f24 Add zoom functions and sendCommand.
b2060030
2009-10-06 13:25:10 -07:00
Fred Quintana
f83d9b3fcd fix build breakage 2009-10-06 13:21:23 -07:00
Jim Miller
5037e57fd4 Fix for 2161835: Tweaks to rotary lock screen:
- Make inactive dimples dim.
- When an item is grabbed, make all other dimples dim.
2009-10-06 13:20:46 -07:00
Bjorn Bringert
4eb3efc8b2 Fix back button handling in ACTV
AutoCompleteTextView.onKeyPreIme() used
getKeyDispatcherState().startTracking(event, this) to start tracking
the back button, but didn't update the state of the event
before checking event.isTracking().

Fixes http://b/issue?id=2167168
"AutoCompleteTextView back button handling is broken"

Change-Id: I2c5f1e761872b9e02d85ff6f958fabd558d041a0
2009-10-06 20:29:08 +01:00
Fred Quintana
77a7bdce65 am 5bba632d: - hide Entity and all its references - remove updateEntity and insertEntity, since they are not used - add the RawContacts.Entity class, which is used in lieu of the android.content.Entity
Merge commit '5bba632d877c2878384ff21566c8eb6a1a22f37b' into eclair-mr2

* commit '5bba632d877c2878384ff21566c8eb6a1a22f37b':
  - hide Entity and all its references
2009-10-06 12:04:41 -07:00
Fred Quintana
5bba632d87 - hide Entity and all its references
- remove updateEntity and insertEntity, since they are not
  used
- add the RawContacts.Entity class, which is used in lieu of the
  android.content.Entity
2009-10-06 11:51:19 -07:00
Suchi Amalapurapu
ef3c63ad20 am 5163cd6d: Merge change I5be3d603 into eclair
Merge commit '5163cd6d1cb664977eb4473b98657c7e92ae430e' into eclair-mr2

* commit '5163cd6d1cb664977eb4473b98657c7e92ae430e':
  Make sdk version and code names static finals in PackageParser.
2009-10-06 11:48:00 -07:00
Android (Google) Code Review
5163cd6d1c Merge change I5be3d603 into eclair
* changes:
      Make sdk version and code names static finals in PackageParser.     Remove api to set these values.     Remove an unused method in AppSecurityPermissions
2009-10-06 14:36:43 -04:00
Daisuke Miyakawa
4613007b57 am 629f94fa: am ccc214b2: Merge change I6a0b14bd into eclair
Merge commit '629f94fac71856bea9694d6db4f6b955c5f50651' into eclair-mr2-plus-aosp

* commit '629f94fac71856bea9694d6db4f6b955c5f50651':
  Make VCardComposer create the instance for mHandlerList.
2009-10-06 11:00:36 -07:00
Daisuke Miyakawa
629f94fac7 am ccc214b2: Merge change I6a0b14bd into eclair
Merge commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae' into eclair-mr2

* commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae':
  Make VCardComposer create the instance for mHandlerList.
2009-10-06 10:53:52 -07:00
Suchi Amalapurapu
8d5ae98549 Make sdk version and code names static finals in PackageParser.
Remove api to set these values.
    Remove an unused method in AppSecurityPermissions
2009-10-06 10:29:06 -07:00
Daisuke Miyakawa
0dd32c1b27 Make VCardComposer create the instance for mHandlerList.
Previously the creation was delayed until addHandler(), which
had been required to be called.

However, after VCardComoser's support toward PBAP stuffs,
the guarantee was not true any more.

So by creating the instance in constructor, we refrain NPE during
finalize() when PBAP uses VCardComposer.
2009-10-06 09:30:20 -07:00
Nick Pelly
3f25987d33 am d4cf13a6: am 52cde727: Fix docs builds.
Merge commit 'd4cf13a651ecc7dde5a2a68062d4d9d569967183' into eclair-mr2-plus-aosp

* commit 'd4cf13a651ecc7dde5a2a68062d4d9d569967183':
  Fix docs builds.
2009-10-06 07:27:17 -07:00
Nick Pelly
d4cf13a651 am 52cde727: Fix docs builds.
Merge commit '52cde7279bad58285704498eea57bdaf9e595b49' into eclair-mr2

* commit '52cde7279bad58285704498eea57bdaf9e595b49':
  Fix docs builds.
2009-10-06 07:21:35 -07:00
Nick Pelly
52cde7279b Fix docs builds. 2009-10-06 16:10:02 +02:00
Nick Pelly
a1cb6a64c6 am 460965c2: am 24bb9b8a: Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Merge commit '460965c2d944d046d00a65dc8675802a10d8aba3' into eclair-mr2-plus-aosp

* commit '460965c2d944d046d00a65dc8675802a10d8aba3':
  Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
2009-10-06 06:16:00 -07:00
Nick Pelly
460965c2d9 am 24bb9b8a: Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Merge commit '24bb9b8af4ff691538fe9e517e8156016b0da6cd' into eclair-mr2

* commit '24bb9b8af4ff691538fe9e517e8156016b0da6cd':
  Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
2009-10-06 06:10:28 -07:00
Nick Pelly
24bb9b8af4 Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Hide listenUsingRfcommOn(int channel)
Add listenUsingRfcomm(String name, ParcelUuid uuid)

The new API automatically finds a free RFCOMM channel and registers an SDP
record with the given uuid and name. The SDP record is automatically
removed when the socket is closed, or if the application dies.

Apps are prevented from registering SDP records with the uuid of system
Bluetooth profiles, such as A2DP, HFP and OPP.

Apps are prevented from removing SDP records that they did not create. This is
tracked by pid.

TODO: Provide an API for the connecting app to look up an SDP record.

Bug: 2158900
DrNo: eastham
Joke: "What did the dog say to the tree? bark."
Change-Id: Ia92f51c34615a7270a403255ad2b8faa98c4a3f5
2009-10-06 05:57:50 -07:00
Fred Quintana
70cdb4d684 am 0eb2d838: am 5fbaefc3: Merge change I4db3a5b3 into eclair
Merge commit '0eb2d8383323dd4567cd668a6d4e77d8556a34b4' into eclair-mr2-plus-aosp

* commit '0eb2d8383323dd4567cd668a6d4e77d8556a34b4':
  fix a javadoc build breakage
2009-10-05 17:32:37 -07:00
Fred Quintana
0eb2d83833 am 5fbaefc3: Merge change I4db3a5b3 into eclair
Merge commit '5fbaefc3d8840aac12b16458347b3c1ddbdaf542' into eclair-mr2

* commit '5fbaefc3d8840aac12b16458347b3c1ddbdaf542':
  fix a javadoc build breakage
2009-10-05 17:27:31 -07:00
Android (Google) Code Review
5fbaefc3d8 Merge change I4db3a5b3 into eclair
* changes:
  fix a javadoc build breakage
2009-10-05 20:22:27 -04:00
Fred Quintana
4db3a5b327 fix a javadoc build breakage 2009-10-05 17:19:03 -07:00
Dianne Hackborn
4bc6158d6b am baad552d: am 68d881cf: Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit 'baad552dfd6e9d244659e7509ff958ec8f449c03' into eclair-mr2-plus-aosp

* commit 'baad552dfd6e9d244659e7509ff958ec8f449c03':
  Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
2009-10-05 16:04:51 -07:00