Commit Graph

8360 Commits

Author SHA1 Message Date
Mike Lockwood
05c487b352 am 401a712e: IPowerManager: remove some unused methods.
Merge commit '401a712e3b3b41c77e79a130d7b07d653e18bcab' into eclair-mr2-plus-aosp

* commit '401a712e3b3b41c77e79a130d7b07d653e18bcab':
  IPowerManager: remove some unused methods.
2009-11-20 09:56:25 -08:00
Scott Main
35f28c7d40 am 820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '820a4e7dd6adeff162a92ca40ebe2f109561036b' into eclair

* commit '820a4e7dd6adeff162a92ca40ebe2f109561036b':
  docs change for ESD: add samples html pages for offline docs
2009-11-20 09:54:52 -08:00
Scott Main
e6102458d5 am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair

* commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 09:54:22 -08:00
Ben Murdoch
3488ba5e90 am aa5e25d2: Re-run update-api to fix the build.
Merge commit 'aa5e25d2205fdba8663cfb7658e227658a06606c' into eclair-mr2-plus-aosp

* commit 'aa5e25d2205fdba8663cfb7658e227658a06606c':
  Re-run update-api to fix the build.
2009-11-20 03:13:15 -08:00
Ben Murdoch
125fb922e0 am 7caaeecc: Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
Merge commit '7caaeecce1b04e2098dd4f471fdd69ebe28c31b0' into eclair-mr2-plus-aosp

* commit '7caaeecce1b04e2098dd4f471fdd69ebe28c31b0':
  Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
2009-11-20 02:20:02 -08:00
Eric Laurent
09b4ba82d7 Issue 2265163: Audio still reported routed through earpiece on sholes
This is a second attempt to fix the audio routed to earpiece syndrom.
The root cause identified this time is the crash of an application having an active AudioTrack playing on the VOICE_CALL stream type.
When this happens, the AudioTrack destructor is not called and the audio policy manager is not notified of the track stop.
Results a situation where the VOICE_CALL stream is considered as always in use by audio policy manager which makes that audio is routed to earpiece.

The fix consists in moving the track start/stop/close notification to audio policiy manager from AudioTrack to AudioFlinger Track objet.
The net result is that in the case of a client application crash, the AudioFlinger TrackHandle object (which implements the remote side of the IAudioTrack binder interface) destructor is called which in turn destroys the Track object and we can notify the audio policy manager of the track stop and removal.

The same modification is made for AudioRecord although no bug related to record has been reported yet.
Also fixed a potential problem if record stop is called while the record thread is exiting.
2009-11-19 23:57:45 -08:00
Daisuke Miyakawa
30d754c2f4 am 5e332efd: Merge change I903ce7b1 into eclair-mr2
Merge commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7' into eclair-mr2-plus-aosp

* commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7':
  Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
2009-11-19 23:19:32 -08:00
Android (Google) Code Review
6e86c8ce85 Merge change I903ce7b1 into eclair-mr2
* changes:
  Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
2009-11-19 23:14:37 -08:00
Joe Onorato
68f08f4849 am 50b69062: am 57bda83d: Merge change I4f614c9e into eclair
Merge commit '50b690625b4dd37475d6966f9037801b2ddde5f8' into eclair-mr2-plus-aosp

* commit '50b690625b4dd37475d6966f9037801b2ddde5f8':
  Add a test app that has 100 icons.  None of them do anything when clicked.
2009-11-19 21:25:07 -08:00
Joe Onorato
779eec250c am 57bda83d: Merge change I4f614c9e into eclair
Merge commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870' into eclair-mr2

* commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870':
  Add a test app that has 100 icons.  None of them do anything when clicked.
2009-11-19 21:20:18 -08:00
Android (Google) Code Review
716534ba06 Merge change I4f614c9e into eclair
* changes:
  Add a test app that has 100 icons.  None of them do anything when clicked.
2009-11-19 20:17:06 -08:00
Mathias Agopian
1850ea3a03 am b439f561: am 13feccf5: Merge change I39f0003e into eclair
Merge commit 'b439f561a6aa3900f1850e71a4aa60618af13f90' into eclair-mr2-plus-aosp

* commit 'b439f561a6aa3900f1850e71a4aa60618af13f90':
  fix [2235414] libagl glDeleteBuffers() crashes
2009-11-19 19:12:01 -08:00
Mathias Agopian
8386ce0d5b am 13feccf5: Merge change I39f0003e into eclair
Merge commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae' into eclair-mr2

* commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae':
  fix [2235414] libagl glDeleteBuffers() crashes
2009-11-19 19:07:36 -08:00
Android (Google) Code Review
1a1ce3a6a2 Merge change I39f0003e into eclair
* changes:
  fix [2235414] libagl glDeleteBuffers() crashes
2009-11-19 19:03:53 -08:00
Daisuke Miyakawa
34803aa012 am 4f81eac4: Merge change I27b1bb90 into eclair-mr2
Merge commit '4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09' into eclair-mr2-plus-aosp

* commit '4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09':
  Refactor vCard test code and modify unit tests.
2009-11-19 18:54:32 -08:00
Android (Google) Code Review
cfab3008e1 Merge change I27b1bb90 into eclair-mr2
* changes:
  Refactor vCard test code and modify unit tests.
2009-11-19 18:50:48 -08:00
Doug Zongker
9ef77bb76d am 6fd4e76c: fix bad link in javadoc that\'s breaking SDK build
Merge commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08' into eclair-mr2-plus-aosp

* commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08':
  fix bad link in javadoc that's breaking SDK build
2009-11-19 18:23:52 -08:00
Dianne Hackborn
86a3dbbdfa am b9ab7126: am 524812fb: Merge change I7d40ad9a into eclair
Merge commit 'b9ab71263ebff601a7c5e00258d92493de85fb36' into eclair-mr2-plus-aosp

* commit 'b9ab71263ebff601a7c5e00258d92493de85fb36':
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:23:31 -08:00
Dianne Hackborn
57972134c5 am 524812fb: Merge change I7d40ad9a into eclair
Merge commit '524812fbf583db5053ff56f7a146fa8fe9296742' into eclair-mr2

* commit '524812fbf583db5053ff56f7a146fa8fe9296742':
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:06:06 -08:00
Android (Google) Code Review
5855937862 Merge change I7d40ad9a into eclair
* changes:
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:01:30 -08:00
Mathias Agopian
a750fc0bf8 fix [2235414] libagl glDeleteBuffers() crashes
don't dereference null pointers, would happen if one of the array wasn't bound.
2009-11-19 17:32:05 -08:00
Doug Zongker
ed10bd655b am 50a21f4d: add reboot() method to PowerManager
Merge commit '50a21f4d3b70360b36acad20e234c380654fd59f' into eclair-mr2-plus-aosp

* commit '50a21f4d3b70360b36acad20e234c380654fd59f':
  add reboot() method to PowerManager
2009-11-19 17:28:42 -08:00
Mathias Agopian
c6f247b4d6 am 793810f6: am 23aa34a7: Merge change I137dac6f into eclair
Merge commit '793810f68fcf1ace817f6ebcb42a6adb13c28582' into eclair-mr2-plus-aosp

* commit '793810f68fcf1ace817f6ebcb42a6adb13c28582':
  backout a workaround that is not needed anymore
2009-11-19 16:34:17 -08:00
Mathias Agopian
4c20530387 am 23aa34a7: Merge change I137dac6f into eclair
Merge commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a' into eclair-mr2

* commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a':
  backout a workaround that is not needed anymore
2009-11-19 16:29:30 -08:00
Mike Chan
d366711836 am b2a51667: am 23b3ef82: Merge change I99194df1 into eclair
Merge commit 'b2a5166704ae76cc468b49710d4c967b58112359' into eclair-mr2-plus-aosp

* commit 'b2a5166704ae76cc468b49710d4c967b58112359':
  frameworks: base: dumpstate: Dump kernel cpufreq speeds.
2009-11-19 16:29:04 -08:00
Mike Chan
e9389bad71 am 23b3ef82: Merge change I99194df1 into eclair
Merge commit '23b3ef82c0c4175e8c953740306ee6b080dae8e7' into eclair-mr2

* commit '23b3ef82c0c4175e8c953740306ee6b080dae8e7':
  frameworks: base: dumpstate: Dump kernel cpufreq speeds.
2009-11-19 16:23:56 -08:00
Android (Google) Code Review
66112b114d Merge change I137dac6f into eclair
* changes:
  backout a workaround that is not needed anymore
2009-11-19 16:23:29 -08:00
Android (Google) Code Review
3250af908d Merge change I99194df1 into eclair
* changes:
  frameworks: base: dumpstate: Dump kernel cpufreq speeds.
2009-11-19 16:18:51 -08:00
Mathias Agopian
60f5d3694b backout a workaround that is not needed anymore
we had to add a call to glFinish() before glReadPixels() because of a bug in the GL ES
driver of a certain device. This is not needed anymore.
2009-11-19 15:52:28 -08:00
Mathias Agopian
f17a5847f1 am fc64165e: am 74a331b5: Merge change I4c29c948 into eclair
Merge commit 'fc64165ef7116a385ae6d9983ab077adc47a6326' into eclair-mr2-plus-aosp

* commit 'fc64165ef7116a385ae6d9983ab077adc47a6326':
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution
2009-11-19 15:51:22 -08:00
Mathias Agopian
b5e90e218b am 74a331b5: Merge change I4c29c948 into eclair
Merge commit '74a331b5dd1d39da44b608743c36ab3523f598d2' into eclair-mr2

* commit '74a331b5dd1d39da44b608743c36ab3523f598d2':
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution
2009-11-19 15:47:37 -08:00
Android (Google) Code Review
48d2c6051e Merge change I4c29c948 into eclair
* changes:
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution
2009-11-19 15:44:13 -08:00
Andreas Huber
6aa01d2384 am 57c70146: am f854e077: (-s ours) Merge change I8134d6ed into eclair
Merge commit '57c701463f57ea50f6116690641f376e84c4c290' into eclair-mr2-plus-aosp

* commit '57c701463f57ea50f6116690641f376e84c4c290':
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
2009-11-19 15:05:02 -08:00
Jason Sams
8c0aa0b895 am d581b1a8: am ddac83a5: Fix extended logging for object dumping.
Merge commit 'd581b1a8c6103b55d2e13318e9c35103b8689810' into eclair-mr2-plus-aosp

* commit 'd581b1a8c6103b55d2e13318e9c35103b8689810':
  Fix extended logging for object dumping.
2009-11-19 15:04:19 -08:00
Andreas Huber
8501b1dca3 am f854e077: (-s ours) Merge change I8134d6ed into eclair
Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-mr2

* commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4':
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
2009-11-19 15:01:14 -08:00
Jason Sams
d16a2223ad am ddac83a5: Fix extended logging for object dumping.
Merge commit 'ddac83a516e939b55f20b226365596760159c9df' into eclair-mr2

* commit 'ddac83a516e939b55f20b226365596760159c9df':
  Fix extended logging for object dumping.
2009-11-19 14:56:39 -08:00
Android (Google) Code Review
ae5f30aed3 Merge change I8134d6ed into eclair
* changes:
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
2009-11-19 14:52:57 -08:00
Mathias Agopian
713795a2e0 fix [2269022] The raw picture displayed post shutter seems to have low-resolution
Make sure to always enable linear filtering in LayerBuffer. This change doesn't affect
devices using overlays.
2009-11-19 14:46:26 -08:00
Daisuke Miyakawa
a6ecb3477d am eb114de5: Merge change I639b0f03 into eclair-mr2
Merge commit 'eb114de5037bba89333bd7d57d305ae989727096' into eclair-mr2-plus-aosp

* commit 'eb114de5037bba89333bd7d57d305ae989727096':
  Make vCard exporter append neighborhood to locality field instead of extended address,
2009-11-19 14:18:11 -08:00
Android (Google) Code Review
35cc19ba12 Merge change I639b0f03 into eclair-mr2
* changes:
  Make vCard exporter append neighborhood to locality field instead of extended address, per China convention.
2009-11-19 14:13:31 -08:00
Grace Kloba
71d68bd26d am 98fdda09: Merge change I86773fbb into eclair-mr2
Merge commit '98fdda09256072ae4f45a08ee40178b3ef643c9f' into eclair-mr2-plus-aosp

* commit '98fdda09256072ae4f45a08ee40178b3ef643c9f':
  If overview width is the same as the current width,
2009-11-19 13:51:20 -08:00
Android (Google) Code Review
7bcd6eaac3 Merge change I86773fbb into eclair-mr2
* changes:
  If overview width is the same as the current width, don't change the mode when double tap or zoom out.
2009-11-19 13:47:24 -08:00
Steve Block
0dd7431e25 am 57534f1b: Improves documentation for GeolocationPermissions class.
Merge commit '57534f1b9f52cea094e8197d1ca40f0d2f68cc66' into eclair-mr2-plus-aosp

* commit '57534f1b9f52cea094e8197d1ca40f0d2f68cc66':
  Improves documentation for GeolocationPermissions class.
2009-11-19 12:08:01 -08:00
Fred Quintana
7eff5299d3 am f61ab007: am 5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place
Merge commit 'f61ab00770c6010d83280644263d6f530c75028e' into eclair-mr2-plus-aosp

* commit 'f61ab00770c6010d83280644263d6f530c75028e':
  -hide AccountManagerResponse, which never should have been exposed in the first place
2009-11-19 12:07:37 -08:00
Dianne Hackborn
a9ef490e78 am 4ee93666: am e4260f4e: Fix build.
Merge commit '4ee936667181975cd755acd81c653ba686d6106d' into eclair-mr2-plus-aosp

* commit '4ee936667181975cd755acd81c653ba686d6106d':
  Fix build.
2009-11-19 12:07:13 -08:00
Fred Quintana
d00412c23d am 5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place
Merge commit '5994cd2898ad3c76d1f5068137a884024f521163' into eclair-mr2

* commit '5994cd2898ad3c76d1f5068137a884024f521163':
  -hide AccountManagerResponse, which never should have been exposed in the first place
2009-11-19 11:41:48 -08:00
lknguyen
c046168e28 am 8250530c: Merge change I194f0808 into eclair-mr2
Merge commit '8250530c507653d57c768677d8a542cd769aaf99' into eclair-mr2-plus-aosp

* commit '8250530c507653d57c768677d8a542cd769aaf99':
  Add Gservices flag so that Market can turn on performance logging for specific groups.
2009-11-19 11:41:35 -08:00
Dianne Hackborn
fe2c1b3efe am e4260f4e: Fix build.
Merge commit 'e4260f4e7da4da32bfab2737018cf9cf75215894' into eclair-mr2

* commit 'e4260f4e7da4da32bfab2737018cf9cf75215894':
  Fix build.
2009-11-19 11:40:48 -08:00
Android (Google) Code Review
9232f6a971 Merge change I194f0808 into eclair-mr2
* changes:
  Add Gservices flag so that Market can turn on performance logging for specific groups.
2009-11-19 11:36:42 -08:00
Dianne Hackborn
0fe7f7b666 am 2b38a09f: am 23ef7b48: Fix most of issue #2271640: Fix wallpaper etc docs
Merge commit '2b38a09f044ad0bb14db7360b352fcca612f49ac' into eclair-mr2-plus-aosp

* commit '2b38a09f044ad0bb14db7360b352fcca612f49ac':
  Fix most of issue #2271640: Fix wallpaper etc docs
2009-11-19 11:14:34 -08:00