13090 Commits

Author SHA1 Message Date
Bai Tao
57928702bf am a8c79a8c: am 90aaaef5: Merge change I0e200c3c into eclair
Merge commit 'a8c79a8c65f0b6ccd0e33b3b05060350381bbb7b' into eclair-mr2-plus-aosp

* commit 'a8c79a8c65f0b6ccd0e33b3b05060350381bbb7b':
  Sending UCS2 encoded SMS correctly
2009-12-01 18:42:13 -08:00
Mathias Agopian
7671c088cd am 77f17095: am 533a2803: Merge change I18ffb549 into eclair
Merge commit '77f17095ed17a6ccc7fc1f1b3ddb31c63bbf66a2' into eclair-mr2-plus-aosp

* commit '77f17095ed17a6ccc7fc1f1b3ddb31c63bbf66a2':
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
2009-12-01 18:41:42 -08:00
Mathias Agopian
a628e02385 am 102f4dbb: am 8e4a110b: Merge change I5469a4ac into eclair
Merge commit '102f4dbb2396e779c588862cfb748ebfc333340d' into eclair-mr2-plus-aosp

* commit '102f4dbb2396e779c588862cfb748ebfc333340d':
  fixed [2260070] display stopped updating
2009-12-01 18:41:01 -08:00
Eric Fischer
7a6a867f9e am c711e06c: am 926492d9: (-s ours) Merge change Ie8493cf1 into eclair
Merge commit 'c711e06c1869b1e5be5b7a9826470564268328ac' into eclair-mr2-plus-aosp

* commit 'c711e06c1869b1e5be5b7a9826470564268328ac':
  Import revised translations.  DO NOT MERGE
2009-12-01 18:40:07 -08:00
Eric Laurent
e77d408345 am 5e392e2b: am bb3bb57a: Merge change I524dc046 into eclair
Merge commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565' into eclair-mr2-plus-aosp

* commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-12-01 18:39:17 -08:00
Bai Tao
a8c79a8c65 am 90aaaef5: Merge change I0e200c3c into eclair
Merge commit '90aaaef5f97ee885cc5898f3e7517ad4e5943d2f' into eclair-mr2

* commit '90aaaef5f97ee885cc5898f3e7517ad4e5943d2f':
  Sending UCS2 encoded SMS correctly
2009-12-01 17:16:50 -08:00
Mathias Agopian
77f17095ed am 533a2803: Merge change I18ffb549 into eclair
Merge commit '533a2803506cc4f196403fdfafd948bd4f8e60d9' into eclair-mr2

* commit '533a2803506cc4f196403fdfafd948bd4f8e60d9':
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
2009-12-01 17:13:50 -08:00
Romain Guy
9e2d2e746b am cf98f426: Merge change I325e22ca into eclair-mr2
Merge commit 'cf98f4268cc70228ef49350f1ccef1266f2e3cf8' into eclair-mr2-plus-aosp

* commit 'cf98f4268cc70228ef49350f1ccef1266f2e3cf8':
  Fix a leak in WebView.
2009-12-01 17:11:38 -08:00
Andreas Huber
ae34cf92db am 781ac162: Merge change I8768f2cc into eclair-mr2
Merge commit '781ac16283574ec07cd7b13d67b54b7b4c2c15cb' into eclair-mr2-plus-aosp

* commit '781ac16283574ec07cd7b13d67b54b7b4c2c15cb':
  A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
2009-12-01 17:10:19 -08:00
Mathias Agopian
102f4dbb23 am 8e4a110b: Merge change I5469a4ac into eclair
Merge commit '8e4a110b3e146b30b804d7e2cd0825bf56bd7d0f' into eclair-mr2

* commit '8e4a110b3e146b30b804d7e2cd0825bf56bd7d0f':
  fixed [2260070] display stopped updating
2009-12-01 17:10:08 -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
Eric Fischer
c711e06c18 am 926492d9: (-s ours) Merge change Ie8493cf1 into eclair
Merge commit '926492d9cc51f28f0471352cde77d2d91ae9becd' into eclair-mr2

* commit '926492d9cc51f28f0471352cde77d2d91ae9becd':
  Import revised translations.  DO NOT MERGE
2009-12-01 17:08:16 -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
Eric Laurent
5e392e2b02 am bb3bb57a: Merge change I524dc046 into eclair
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-mr2

* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-12-01 17:04:24 -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
781ac16283 Merge change I8768f2cc into eclair-mr2
* changes:
  A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
2009-12-01 15:42:34 -08:00
Andreas Huber
8768f2ccef A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s). 2009-12-01 15:26:54 -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
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
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
Derek Sollenberger
94c9db5485 am c3e20af0: Merge change Ib16749e2 into eclair-mr2
Merge commit 'c3e20af0b6aed8afe28be5fa08b8d69c6b50f34c' into eclair-mr2-plus-aosp

* commit 'c3e20af0b6aed8afe28be5fa08b8d69c6b50f34c':
  Refactoring the logging interface to remove dependence on NPP.
2009-12-01 05:23:29 -08:00
Android (Google) Code Review
c3e20af0b6 Merge change Ib16749e2 into eclair-mr2
* changes:
  Refactoring the logging interface to remove dependence on NPP.
2009-12-01 05:17:44 -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
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
Android (Google) Code Review
90aaaef5f9 Merge change I0e200c3c into eclair
* changes:
  Sending UCS2 encoded SMS correctly
2009-11-30 16:35:18 -08:00
Doug Zongker
bf72820e77 am b292461c: Merge change I305e1b8f into eclair-mr2
Merge commit 'b292461c6791b6e6780085358a5ba15f688e70ba' into eclair-mr2-plus-aosp

* commit 'b292461c6791b6e6780085358a5ba15f688e70ba':
  add --esn option to am to allow adding extra with a null value
2009-11-30 16:27:56 -08:00
Android (Google) Code Review
b292461c67 Merge change I305e1b8f into eclair-mr2
* changes:
  add --esn option to am to allow adding extra with a null value
2009-11-30 16:23:09 -08:00
Doug Zongker
305e1b8fe9 add --esn option to am to allow adding extra with a null value 2009-11-30 16:15:15 -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
Android (Google) Code Review
533a280350 Merge change I18ffb549 into eclair
* changes:
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
2009-11-30 12:13:01 -08:00
Mathias Agopian
18ffb5493b fix [2069023] STOPSHIP: disable DEBUG_COPYBIT 2009-11-30 12:10:53 -08:00
Android (Google) Code Review
8e4a110b3e Merge change I5469a4ac into eclair
* changes:
  fixed [2260070] display stopped updating
2009-11-30 11:55:10 -08:00
Android (Google) Code Review
926492d9cc Merge change Ie8493cf1 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-11-30 11:54:46 -08:00
Eric Fischer
e8493cf14a Import revised translations. DO NOT MERGE 2009-11-30 11:33:16 -08:00
Bai Tao
0e200c3cbe Sending UCS2 encoded SMS correctly
http://b/2285139
2009-11-30 11:28:37 -08:00
Mathias Agopian
5469a4ac1c fixed [2260070] display stopped updating
always check that the visible region isn't empty after all visible regions are recomputed
clear he freeze-lock if it is.
2009-11-30 11:15:41 -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
Mike Lockwood
239775a2ce am 3766ae55: Merge change I707f53cd into eclair-mr2
Merge commit '3766ae5551e6231c251b0af38206aea30a49df63' into eclair-mr2-plus-aosp

* commit '3766ae5551e6231c251b0af38206aea30a49df63':
  LightsService cleanup:
2009-11-30 11:00:04 -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
Android (Google) Code Review
3766ae5551 Merge change I707f53cd into eclair-mr2
* changes:
  LightsService cleanup:
2009-11-30 10:08:58 -08:00
Android (Google) Code Review
bb3bb57a63 Merge change I524dc046 into eclair
* changes:
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-11-30 10:00:06 -08:00