12967 Commits

Author SHA1 Message Date
Scott Main
e16113998b 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
Mike Lockwood
401a712e3b IPowerManager: remove some unused methods.
Change-Id: I7c7fa7eaf6c99e723da20939c27fbc172ad51613
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-20 11:50:21 -05:00
Eric Laurent
2083b297e4 Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
The cause of the problem is that under certain circumstance the HeadsetObserver receives unexpected connection events. For instance,
when removing a bad quality 3.5mm stereo jack without mic the following events can be received:
1 connection of a headset with mic
2 removal of a headset with mic.

The result is that the no mic headset is never disconnected and audio policy manager considers it is still present. Then the music or downlink call audio is always routed to headset even if none is connected giving the impression that audio is lost, except whne you reconnect a headset of enable speaker phone.

The fix consists in adding more checks in HeadsetObserver to reject illegal transitions in headset state received from event observer.
2009-11-20 07:26:56 -08:00
Ben Murdoch
12c90b0525 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
aa5e25d220 Re-run update-api to fix the build.
Change-Id: If0f44e639ab96ccbf3cd1566184dcee595f6f0f8
2009-11-20 10:55:20 +00:00
Ben Murdoch
c26197e02c 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
Ben Murdoch
7caaeecce1 Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
BUG=b/2271636

Change-Id: Ia9bed430c624c4c3745904c98fb2e27632d929f9
2009-11-20 10:14:46 +00:00
Eric Laurent
49f02be9d7 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
4ee476ef94 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
5e332efd56 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
Daisuke Miyakawa
a750fdd765 Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
Internal issue number: 2195990
2009-11-20 16:13:07 +09:00
Joe Onorato
e627a75974 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
50b690625b 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
Scott Main
820a4e7dd6 docs change for ESD: add samples html pages for offline docs
bug: 2160782
Change-Id: I30fedc9e9b015ad035fa954ca0b1a19e846cca78
2009-11-19 20:31:57 -08:00
Android (Google) Code Review
57bda83d10 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
Joe Onorato
4f614c9efb Add a test app that has 100 icons. None of them do anything when clicked. 2009-11-19 20:15:27 -08:00
Mathias Agopian
8e9af2bd1d 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
b439f561a6 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
13feccf592 Merge change I39f0003e into eclair
* changes:
  fix [2235414] libagl glDeleteBuffers() crashes
2009-11-19 19:03:53 -08:00
Daisuke Miyakawa
23eb822369 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
4f81eac4ea 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
043c727662 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
7937464319 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
Daisuke Miyakawa
673c1d1fc9 Refactor vCard test code and modify unit tests.
Factor out all the classes previously embedded in VCardTestsBase.java so that readers are able to
look over each file easily and each class explicitly mention the dependency between each other.

Make all the test cases use mVerifier in VCardTestsBase so that verify() call will not be
forgotten. Actually there were three tests found in which verify() was not called.

Internal issue number: 2195990
2009-11-20 11:18:49 +09:00
Doug Zongker
6fd4e76ca1 fix bad link in javadoc that's breaking SDK build 2009-11-19 18:17:15 -08:00
Dianne Hackborn
b9ab71263e 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
524812fbf5 Merge change I7d40ad9a into eclair
* changes:
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:01:30 -08:00
Mathias Agopian
39f0003e3a 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
a7ad3f6c71 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
Doug Zongker
50a21f4d3b add reboot() method to PowerManager
In order to unbundle System Update, we need some to expose in the SDK
some way to reboot the device into recovery.  Add a reboot() method to
PowerManager, protected by the android.permission.REBOOT permission.
2009-11-19 17:18:31 -08:00
Dianne Hackborn
08ee42ce86 More on issue #2271640: Fix wallpaper etc docs
Publish the features developers may be interested in.

Change-Id: I7d40ad9a9f4b9770e2f8dd1b0a729b0d322c062e
2009-11-19 17:08:01 -08:00
Scott Main
6d95fc0a2c docs for ESR: add docs to bluetooth explainin that discovery should
be cancelled before connecting to a device

bug: 2160782,2198463
2009-11-19 17:06:54 -08:00
Mathias Agopian
9aaf01b9d0 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
793810f68f 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
26a9a13ac3 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
Wink Saville
0e57e73575 Increase the default wake lock timeout.
Previously the wake lock time was 5 seconds but there
are operations which take longer such as setting up
and tearing down so increase the default to 30 seconds.
Also provide TelephonyProperty.PROPERTY_WAKE_LOCK_TIMEOUT
so it can be overridden at build time.

Bug: 2268276
Change-Id: I3ae1fb196564c9fd5b9ea3e3b0927be9dd9ef255
2009-11-19 16:26:29 -08:00
Mike Chan
b2a5166704 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
23aa34a743 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
23b3ef82c0 Merge change I99194df1 into eclair
* changes:
  frameworks: base: dumpstate: Dump kernel cpufreq speeds.
2009-11-19 16:18:51 -08:00
Mike Chan
c6b406f0eb frameworks: base: dumpstate: Dump kernel cpufreq speeds.
Change-Id: I99194df1d6c46254affef86ea8eb39e784c3dfb3
Signed-off-by: Mike Chan <mike@android.com>
2009-11-19 16:01:05 -08:00
Mathias Agopian
137dac6f10 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
ce18c9680e 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
fc64165ef7 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
74a331b5dd 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
7227e72bf4 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
93f409b5f7 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
57c701463f 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
d581b1a8c6 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
f854e07702 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
4c29c9487e 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