Commit Graph

6073 Commits

Author SHA1 Message Date
Leon Scroggins
3e22f3c866 am db08d5cd: (-s ours) DO NOT MERGE.
Merge commit 'db08d5cd441424e4f9621aae7c2414934f781400' into eclair-mr2

* commit 'db08d5cd441424e4f9621aae7c2414934f781400':
  DO NOT MERGE.
2009-12-02 05:25:12 -08:00
Android (Google) Code Review
abb64629e2 Merge change I5ff64f6f into eclair-mr2
* changes:
  Add CameraServiceTest.
2009-12-02 02:48:40 -08:00
Scott Main
39b2dcd126 am 0bd1eeaf: Merge change I21a67b8d into eclair
Merge commit '0bd1eeaf90d854c487feb8ee35c5c74af28ebc74' into eclair-mr2

* commit '0bd1eeaf90d854c487feb8ee35c5c74af28ebc74':
  docs: remove droid-specific behavior change from platform notes
2009-12-01 18:31:19 -08:00
Jaikumar Ganesh
b18020b91a am a80a75f3: (-s ours) Merge change I5f24a240 into eclair
Merge commit 'a80a75f34a98fe1e41afab93c97aca505939903a' into eclair-mr2

* commit 'a80a75f34a98fe1e41afab93c97aca505939903a':
  Register Handsfree profile before headset profile. DO NOT MERGE.
2009-12-01 18:30:45 -08:00
Mike Lockwood
79df7759e9 am abf7fed2: Merge change I2b7c8a32 into eclair
Merge commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6' into eclair-mr2

* commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6':
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
2009-12-01 18:30:12 -08:00
Bai Tao
b426f63c14 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
ea5b203790 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
Mathias Agopian
5f1cc4826c 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
Eric Fischer
95023f0409 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
Eric Laurent
811f2943a7 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
271715e469 Merge change I325e22ca into eclair-mr2
* changes:
  Fix a leak in WebView.
2009-12-01 16:40:07 -08:00
Android (Google) Code Review
171fb3a654 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
Android (Google) Code Review
5cd52bc9e3 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
Android (Google) Code Review
54be503563 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
413b440bbb 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
Android (Google) Code Review
37c5893f4d Merge change Ib16749e2 into eclair-mr2
* changes:
  Refactoring the logging interface to remove dependence on NPP.
2009-12-01 05:17:44 -08:00
Android (Google) Code Review
87029dbc46 Merge change I21a67b8d into eclair
* changes:
  docs: remove droid-specific behavior change from platform notes
2009-11-30 17:38:57 -08:00
Android (Google) Code Review
6a44e6c08f Merge change I5f24a240 into eclair
* changes:
  Register Handsfree profile before headset profile. DO NOT MERGE.
2009-11-30 17:00:43 -08:00
Android (Google) Code Review
59eceed3cf Merge change I2b7c8a32 into eclair
* changes:
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
2009-11-30 16:39:53 -08:00
Android (Google) Code Review
68b1e635ce 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
b0f0d44672 Merge change I0e200c3c into eclair
* changes:
  Sending UCS2 encoded SMS correctly
2009-11-30 16:35:18 -08:00
Android (Google) Code Review
3c84b1fa54 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
Android (Google) Code Review
7462be0240 Merge change I18ffb549 into eclair
* changes:
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
2009-11-30 12:13:01 -08:00
Mathias Agopian
f74573486d fix [2069023] STOPSHIP: disable DEBUG_COPYBIT 2009-11-30 12:10:53 -08:00
Android (Google) Code Review
2688bf49c4 Merge change I5469a4ac into eclair
* changes:
  fixed [2260070] display stopped updating
2009-11-30 11:55:10 -08:00
Android (Google) Code Review
067be1dd47 Merge change Ie8493cf1 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-11-30 11:54:46 -08:00
Mathias Agopian
c61de17f14 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
Android (Google) Code Review
430248d031 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
6b1f76180a Merge change I707f53cd into eclair-mr2
* changes:
  LightsService cleanup:
2009-11-30 10:08:58 -08:00
Android (Google) Code Review
def563c451 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
Dima Zavin
fe8401d2f6 am f817218e: dumpstate: Pick up the last kernel log from /proc
Merge commit 'f817218e09a556f20efc81309ba2cdb3475a370b' into eclair-mr2

* commit 'f817218e09a556f20efc81309ba2cdb3475a370b':
  dumpstate: Pick up the last kernel log from /proc
2009-11-29 13:51:14 -08:00
Eric Laurent
059b413e65 Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Do not play ringtones, notifications or camera sounds if ringer mode is silent.
2009-11-27 05:07:55 -08:00
Owen Lin
7371ed684e Set more camera parameters initial values.
We will need those values for new camera framework. And change the canned jpeg
image to match the new width and height setting.

Change-Id: I49f8fb63d2b859b9e9f1c5d27657a10203315bb6
2009-11-27 12:52:32 +08:00
Android (Google) Code Review
6222a51ec1 Merge change I59214d5d into eclair-mr2
* changes:
  Add a new priority for Auto Connection of A2DP.
2009-11-25 15:36:55 -08:00
Joe Onorato
6daf433c02 am bcab01f6: Merge change Ic9f6bf94 into eclair
Merge commit 'bcab01f6d0158c4d928f42b034949dc9608665a6' into eclair-mr2

* commit 'bcab01f6d0158c4d928f42b034949dc9608665a6':
  Add a test app that will drain the battery.  NOT IN BUILD.
2009-11-25 13:58:28 -08:00
Android (Google) Code Review
8f80ef1135 Merge change Ic9f6bf94 into eclair
* changes:
  Add a test app that will drain the battery.  NOT IN BUILD.
2009-11-25 13:52:08 -08:00
Jack Palevich
f8df9b0170 am ca00dee2: Merge change I5aa3adcf into eclair
Merge commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5' into eclair-mr2

* commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5':
  Improve the exception message text by including eglGetError().
2009-11-25 13:48:54 -08:00
Android (Google) Code Review
579c593593 Merge change I5aa3adcf into eclair
* changes:
  Improve the exception message text by including eglGetError().
2009-11-25 13:43:07 -08:00
Android (Google) Code Review
5fcb0ffbf9 Merge change Id6ccc9bc into eclair-mr2
* changes:
  Update documentation: The width of the image for face detection must be even.
2009-11-25 13:41:34 -08:00
Android (Google) Code Review
9433400787 Merge change I5ec249ab into eclair-mr2
* changes:
  More elimination of Formatter (I was tired of waiting several seconds for "dumpsys dropbox"...).
2009-11-25 13:40:10 -08:00
Dianne Hackborn
40c52f9c65 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
Brett Chabot
a06c572875 am d782b4b6: Add keyguard permission to instrumented ImfTest package.
Merge commit 'd782b4b6f3411ece7299f414783baa3758756bbe' into eclair-mr2

* commit 'd782b4b6f3411ece7299f414783baa3758756bbe':
  Add keyguard permission to instrumented ImfTest package.
2009-11-25 13:02:55 -08:00
Android (Google) Code Review
97d997265f Merge change Ieb7a7d57 into eclair-mr2
* changes:
  Change the DropBoxManager API slightly (this is public, but not yet released) -- take a File instead of a ParcelFileDescriptor (gets opened internally) -- that way the caller doesn't have to worry about closing their PFD and so on. (Pretty much 100% of the time the caller will be uploading a file, anyway.)
2009-11-25 12:59:48 -08:00
Android (Google) Code Review
ed1f111364 Merge change Ie552036f into eclair
* changes:
  Fix issue #2286419: maxSdkVersion causes existing apps to disappear.
2009-11-25 12:55:44 -08:00
Android (Google) Code Review
844f19f058 Merge change Id7b9903e into eclair-mr2
* changes:
  Add setAttentionLight() to IPowerManager for the Phone app.
2009-11-25 12:34:28 -08:00
Android (Google) Code Review
d0ed2ec40b Merge change I4413e8bc into eclair-mr2
* changes:
  close file descriptors passed to drop box
2009-11-25 11:54:17 -08:00
Android (Google) Code Review
ee462bdd05 Merge change I086d681f into eclair-mr2
* changes:
  Remove HardwareService and move vibrator support to VibratorService.
2009-11-25 11:49:32 -08:00
Android (Google) Code Review
bce0a7ce71 Merge change I4ad9ec48 into eclair-mr2
* changes:
  Fix A2dpAudioInterface getParameters.
2009-11-25 11:01:17 -08:00
Android (Google) Code Review
97eb6684f2 Merge change I3f4f5f05 into eclair-mr2
* changes:
  cdma tones: Fix Call Waiting Tone in the hash map
2009-11-25 09:39:29 -08:00
Eric Laurent
760971d097 Fix A2dpAudioInterface getParameters.
A2dpAudioInterface::getParameters() was prepending a ';' to the key value pair returned from underlying AudioHardwareInterface.
2009-11-25 06:08:44 -08:00