Commit Graph

7814 Commits

Author SHA1 Message Date
Dianne Hackborn
0b63b9fb56 am 5886050f: Merge change I0d8f7593 into eclair
Merge commit '5886050fad97923c33cbc831fe07a5b1746b2b58' into eclair-plus-aosp

* commit '5886050fad97923c33cbc831fe07a5b1746b2b58':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-01 17:10:27 -08:00
Vasu Nori
3414c67afa am 1533aed6: Merge change Ib1dd3235 into eclair-mr2
Merge commit '1533aed6d90b776c815bae819d1413064aa1f0d9' into eclair-mr2-plus-aosp

* commit '1533aed6d90b776c815bae819d1413064aa1f0d9':
  fix NPE. don't release an already released compiledSql obj
2009-12-01 17:08:38 -08:00
Leon Scroggins
25f2b2fad2 am db08d5cd: DO NOT MERGE.
Merge commit 'db08d5cd441424e4f9621aae7c2414934f781400' into eclair-plus-aosp

* commit 'db08d5cd441424e4f9621aae7c2414934f781400':
  DO NOT MERGE.
2009-12-01 17:07:13 -08:00
Jaikumar Ganesh
4b9e9c37d5 am 03cb1f15: Merge change I249345ee into eclair-mr2
Merge commit '03cb1f15ca73900f62c12694e05bb0b0e0b6669d' into eclair-mr2-plus-aosp

* commit '03cb1f15ca73900f62c12694e05bb0b0e0b6669d':
  Add AUTO_CONNECT priority for Headset profile.
2009-12-01 17:06:59 -08:00
Derek Sollenberger
079324bf5b am 732a1223: Merge change I42d00fbe into eclair-mr2
Merge commit '732a1223b21cef3561ffbbb9f6ec2d2d2a8b5e5c' into eclair-mr2-plus-aosp

* commit '732a1223b21cef3561ffbbb9f6ec2d2d2a8b5e5c':
  fix issue with plugin surfaces not updating properly within the view system.
2009-12-01 17:05:18 -08:00
Android (Google) Code Review
cf98f4268c Merge change I325e22ca into eclair-mr2
* changes:
  Fix a leak in WebView.
2009-12-01 16:40:07 -08:00
Romain Guy
01d0fbfa68 Fix a leak in WebView.
Fixes #2296601.

WebView and its related APIs are keeping static objects that hold references to
Context instance. This could cause applications to leak their first Activity
and all the associated resources.
2009-12-01 16:37:59 -08:00
Android (Google) Code Review
5886050fad Merge change I0d8f7593 into eclair
* changes:
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-01 15:57:50 -08:00
Dmitri Plotnikov
9618608708 Adding NAME_RAW_CONTACT_ID column to Contacts.
Change-Id: Icae1a99017a2165c30c7c78b7de77e39a73743b4
2009-12-01 14:36:11 -08:00
Dianne Hackborn
a7ca0e5e32 Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
Change-Id: I0d8f75938226e1bb49cf7b1154445631b0bb0bc9
2009-12-01 14:31:55 -08:00
Android (Google) Code Review
1533aed6d9 Merge change Ib1dd3235 into eclair-mr2
* changes:
  fix NPE. don't release an already released compiledSql obj
2009-12-01 14:24:52 -08:00
Vasu Nori
b1dd3235a9 fix NPE. don't release an already released compiledSql obj 2009-12-01 14:16:24 -08:00
Android (Google) Code Review
03cb1f15ca Merge change I249345ee into eclair-mr2
* changes:
  Add AUTO_CONNECT priority for Headset profile.
2009-12-01 12:45:49 -08:00
Android (Google) Code Review
732a1223b2 Merge change I42d00fbe into eclair-mr2
* changes:
  fix issue with plugin surfaces not updating properly within the view system.
2009-12-01 12:26:54 -08:00
Derek Sollenberger
42d00fbe55 fix issue with plugin surfaces not updating properly within the view system. 2009-12-01 15:19:42 -05:00
Leon Scroggins
db08d5cd44 DO NOT MERGE.
Fix for http://b/issue?id=2292512

When pressing the trackball on a WebTextView, open the IME.

Change-Id: I5ea74ca7ce51ac509dc8649b8f8d1869287bb7a9
2009-12-01 14:42:55 -05:00
Mark Wagner
742f9cbd76 New constants for db upgrade. 2009-12-01 10:08:06 -08:00
Leon Scroggins
123da9e933 am e459aa64: am ed90811e: Do not peform a click/move if longpress has been performed in WebTextView.
Merge commit 'e459aa64515f91b494843d2eb2852be2da3d1628'

* commit 'e459aa64515f91b494843d2eb2852be2da3d1628':
  Do not peform a click/move if longpress has been performed in WebTextView.
2009-12-01 09:20:19 -08:00
Derek Sollenberger
acd9492cca am d9342817: am 51e45ff0: Cleanup how a plugin goes full-screen.
Merge commit 'd93428177a3b54a5fdb9b660a04ec4001cd0efb6'

* commit 'd93428177a3b54a5fdb9b660a04ec4001cd0efb6':
  Cleanup how a plugin goes full-screen.
2009-12-01 09:15:19 -08:00
Jaikumar Ganesh
c8b99148e9 am 7e8ebcea: am e34fbbd7: Merge change I77b4ad0e into eclair-mr2
Merge commit '7e8ebcead7469032e08c4cb9e5bda3d73961f0b3'

* commit '7e8ebcead7469032e08c4cb9e5bda3d73961f0b3':
  Register Handsfree profile before headset profile.
2009-12-01 09:12:56 -08:00
Leon Scroggins
e459aa6451 am ed90811e: Do not peform a click/move if longpress has been performed in WebTextView.
Merge commit 'ed90811e711065bcc82a45f4173587cd95ef6b6f' into eclair-mr2-plus-aosp

* commit 'ed90811e711065bcc82a45f4173587cd95ef6b6f':
  Do not peform a click/move if longpress has been performed in WebTextView.
2009-12-01 09:12:01 -08:00
Mike Lockwood
4cbe8ef11e am 15740edd: am b70da2bb: Merge change I1c281504 into eclair-mr2
Merge commit '15740edd2ac0026e97699028d07e6b0e773d3643'

* commit '15740edd2ac0026e97699028d07e6b0e773d3643':
  Remove some unused window manager methods.
2009-12-01 09:10:03 -08:00
Leon Scroggins
ed90811e71 Do not peform a click/move if longpress has been performed in WebTextView. 2009-12-01 11:39:46 -05:00
Derek Sollenberger
d93428177a am 51e45ff0: Cleanup how a plugin goes full-screen.
Merge commit '51e45ff0d53ce299be316e14e48cdd3e3a51d0b0' into eclair-mr2-plus-aosp

* commit '51e45ff0d53ce299be316e14e48cdd3e3a51d0b0':
  Cleanup how a plugin goes full-screen.
2009-12-01 06:14:33 -08:00
Derek Sollenberger
51e45ff0d5 Cleanup how a plugin goes full-screen.
The plugin activity now fetches the plugin's existing java class from native code instead of creating a new one.
2009-12-01 08:50:24 -05:00
Jaikumar Ganesh
c3f25152bf am a80a75f3: Merge change I5f24a240 into eclair
Merge commit 'a80a75f34a98fe1e41afab93c97aca505939903a' into eclair-plus-aosp

* commit 'a80a75f34a98fe1e41afab93c97aca505939903a':
  Register Handsfree profile before headset profile. DO NOT MERGE.
2009-11-30 17:07:08 -08:00
Jaikumar Ganesh
7e8ebcead7 am e34fbbd7: Merge change I77b4ad0e into eclair-mr2
Merge commit 'e34fbbd739329e5aeda2c1a2ef26b96bb1ae42fa' into eclair-mr2-plus-aosp

* commit 'e34fbbd739329e5aeda2c1a2ef26b96bb1ae42fa':
  Register Handsfree profile before headset profile.
2009-11-30 16:40:52 -08:00
Jaikumar Ganesh
5f24a24004 Register Handsfree profile before headset profile. DO NOT MERGE.
There is a delay between registering the two profiles,
and handsfree profile is a superset of the headset profile.
So some devices do an SDP and get the headset profile record
before we have registered the handsfree profile.

a) We can reject all incoming connections till all profiles are
registered, but then this would mean we connect later in some cases.
Registering profiles in this order seems fine to me.

Note: There is a also the need to fix forking sdptool to register
profiles, which would obliviate the need to wait 500 msecs between
profile registrations.

Bug: 2293792
Dr No: Eastham
2009-11-30 16:37:18 -08:00
Android (Google) Code Review
e34fbbd739 Merge change I77b4ad0e into eclair-mr2
* changes:
  Register Handsfree profile before headset profile.
2009-11-30 16:35:43 -08:00
Jaikumar Ganesh
77b4ad0e49 Register Handsfree profile before headset profile.
There is a delay between registering the two profiles,
and handsfree profile is a superset of the headset profile.
So some devices do an SDP and get the headset profile record
before we have registered the handsfree profile.

a) We can reject all incoming connections till all profiles are
registered, but then this would mean we connect later in some cases.
Registering profiles in this order seems fine to me.

Note: There is a also the need to fix forking sdptool to register
profiles, which would obliviate the need to wait 500 msecs between
profile registrations.
2009-11-30 14:17:30 -08:00
Jaikumar Ganesh
249345ee5a Add AUTO_CONNECT priority for Headset profile.
Also, don't set priority to ON while disconnecting.
This logic has been pushed up to the Settings app.
2009-11-30 14:06:59 -08:00
Robert Greenwalt
5154ae7665 Cleanup ConnectivityServices network configuration
Don't instantiate objects not needed for the device.

bug: 2226064
2009-11-30 12:56:02 -08:00
Mike Lockwood
15740edd2a am b70da2bb: Merge change I1c281504 into eclair-mr2
Merge commit 'b70da2bbc594b093472d5333386d79f677fd9e01' into eclair-mr2-plus-aosp

* commit 'b70da2bbc594b093472d5333386d79f677fd9e01':
  Remove some unused window manager methods.
2009-11-30 11:00:34 -08:00
Android (Google) Code Review
b70da2bbc5 Merge change I1c281504 into eclair-mr2
* changes:
  Remove some unused window manager methods.
2009-11-30 10:54:28 -08:00
Derek Sollenberger
7179339cdf am 4cab4e2b: am cb37e715: Refactoring plugins to use new java interfaces.
Merge commit '4cab4e2bf66a9193e0fe049b078158107a5a8fc0'

* commit '4cab4e2bf66a9193e0fe049b078158107a5a8fc0':
  Refactoring plugins to use new java interfaces.
2009-11-30 08:02:06 -08:00
Derek Sollenberger
4cab4e2bf6 am cb37e715: Refactoring plugins to use new java interfaces.
Merge commit 'cb37e71509da43e0d8d809591b09e8f5a582b5cd' into eclair-mr2-plus-aosp

* commit 'cb37e71509da43e0d8d809591b09e8f5a582b5cd':
  Refactoring plugins to use new java interfaces.
2009-11-30 07:55:59 -08:00
Derek Sollenberger
cb37e71509 Refactoring plugins to use new java interfaces.
This change adds 3 new interfaces for plugins to the framework. This
change also includes extensive cleanup as we consolidate internal plugin
functions into the pluginManager.  Also using the new interfaces we no
longer need to pass  additional parameters in quite a few methods.
2009-11-30 08:42:43 -05:00
Mike Lockwood
db727a8a03 Remove some unused window manager methods.
Change-Id: I1c28150416b92b96b9f434270652c4be2613434c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-28 22:28:17 -05:00
Leon Scroggins
0eaa19cf98 am bcf5a23b: am 331c7788: Store info in the bookmarks/history database on whether it was a manually entered url.
Merge commit 'bcf5a23bfa71e97df4946c8dffd2991ca8e68bf9'

* commit 'bcf5a23bfa71e97df4946c8dffd2991ca8e68bf9':
  Store info in the bookmarks/history database on whether it was a manually entered url.
2009-11-27 10:18:08 -08:00
Leon Scroggins
bcf5a23bfa am 331c7788: Store info in the bookmarks/history database on whether it was a manually entered url.
Merge commit '331c7788a84fc6f625ac1bafbb33cf7da1116407' into eclair-mr2-plus-aosp

* commit '331c7788a84fc6f625ac1bafbb33cf7da1116407':
  Store info in the bookmarks/history database on whether it was a manually entered url.
2009-11-27 10:12:13 -08:00
Leon Scroggins
331c7788a8 Store info in the bookmarks/history database on whether it was a manually entered url.
Requires a change in packages/apps/Browser

Fix for http://b/issue?id=2281371
2009-11-27 12:14:47 -05:00
Bjorn Bringert
0f8555b728 Allow resource and file URIs in ImageView.setImageURI()
Before, if you passed an android.resource URI, e.g.
"android.resource://com.android.browser/2130837550"
to ImageView.setImageURI(), it failed with:

I/System.out( 1730): resolveUri failed on bad bitmap uri: android.resource://com.android.browser/2130837550

This change allows android.resource: and file: URIs in addition to the
existing support for content: URIs.

Fixes: http://b/issue?id=2289441

Change-Id: I98819b183c29eb60a70708d373d2199cdc0ea017
2009-11-27 12:49:03 +00:00
Jaikumar Ganesh
d2fa1ff139 am 78b0e0b8: am 429a8eac: Merge change I59214d5d into eclair-mr2
Merge commit '78b0e0b8feab377e44ff01471fa9ca8e1516fb65'

* commit '78b0e0b8feab377e44ff01471fa9ca8e1516fb65':
  Add a new priority for Auto Connection of A2DP.
2009-11-25 15:50:45 -08:00
Jaikumar Ganesh
78b0e0b8fe am 429a8eac: Merge change I59214d5d into eclair-mr2
Merge commit '429a8eaccc133b2ebf610cccf26c4ad323a18ef3' into eclair-mr2-plus-aosp

* commit '429a8eaccc133b2ebf610cccf26c4ad323a18ef3':
  Add a new priority for Auto Connection of A2DP.
2009-11-25 15:43:46 -08:00
Android (Google) Code Review
429a8eaccc Merge change I59214d5d into eclair-mr2
* changes:
  Add a new priority for Auto Connection of A2DP.
2009-11-25 15:36:55 -08:00
Dianne Hackborn
506de3b576 am 5417933a: am d1689ea8: am 8e1985d4: Merge change Ie552036f into eclair
Merge commit '5417933a456f23a0ca30bb73632feee5dd5f8e46'

* commit '5417933a456f23a0ca30bb73632feee5dd5f8e46':
  Fix issue #2286419: maxSdkVersion causes existing apps to disappear.
2009-11-25 13:16:47 -08:00
Dan Egnor
f3ab5c6b32 am 86ef717e: am 99cee031: Merge change Ieb7a7d57 into eclair-mr2
Merge commit '86ef717e2660dbc914dcf68295fbf9943c45bc44'

* commit '86ef717e2660dbc914dcf68295fbf9943c45bc44':
  Change the DropBoxManager API slightly (this is public, but not yet released) --
2009-11-25 13:11:59 -08:00
Dianne Hackborn
5417933a45 am d1689ea8: am 8e1985d4: Merge change Ie552036f into eclair
Merge commit 'd1689ea8b7ec4b36865072aa23a6622d3c5a9513' into eclair-mr2-plus-aosp

* commit 'd1689ea8b7ec4b36865072aa23a6622d3c5a9513':
  Fix issue #2286419: maxSdkVersion causes existing apps to disappear.
2009-11-25 13:10:28 -08:00
Dan Egnor
86ef717e26 am 99cee031: Merge change Ieb7a7d57 into eclair-mr2
Merge commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365' into eclair-mr2-plus-aosp

* commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365':
  Change the DropBoxManager API slightly (this is public, but not yet released) --
2009-11-25 13:04:19 -08:00
Dianne Hackborn
d1689ea8b7 am 8e1985d4: Merge change Ie552036f into eclair
Merge commit '8e1985d4f28bfa9bea7db05f324759991d4e59e9' into eclair-mr2

* commit '8e1985d4f28bfa9bea7db05f324759991d4e59e9':
  Fix issue #2286419: maxSdkVersion causes existing apps to disappear.
2009-11-25 13:03:42 -08:00