15002 Commits

Author SHA1 Message Date
Vasu Nori
5a03f36ef8 maintain cache of statementids returned by sqlite upon compiling a sql stmnt 2009-11-20 14:09:24 -08:00
Jaikumar Ganesh
b148bc844e Fix pairings lost on reboot.
Bug:2277376
Dr No:Eastham
2009-11-20 13:50:26 -08:00
Mike Lockwood
cdfb9899ab am 589f8d7d: am 53e9c126: am a1ce6551: Merge change I69324a33 into eclair
Merge commit '589f8d7d414b132afcef4405122fdf02228f3c8b'

* commit '589f8d7d414b132afcef4405122fdf02228f3c8b':
  AlarmManagerService: Fix daylight savings time offset computation
2009-11-20 13:42:29 -08:00
Mike Lockwood
589f8d7d41 am 53e9c126: am a1ce6551: Merge change I69324a33 into eclair
Merge commit '53e9c126f5fc39459554f0290a2c863f645d397a' into eclair-mr2-plus-aosp

* commit '53e9c126f5fc39459554f0290a2c863f645d397a':
  AlarmManagerService: Fix daylight savings time offset computation
2009-11-20 13:36:14 -08:00
Mike Lockwood
53e9c126f5 am a1ce6551: Merge change I69324a33 into eclair
Merge commit 'a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2' into eclair-mr2

* commit 'a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2':
  AlarmManagerService: Fix daylight savings time offset computation
2009-11-20 13:32:17 -08:00
Android (Google) Code Review
a1ce6551e1 Merge change I69324a33 into eclair
* changes:
  AlarmManagerService: Fix daylight savings time offset computation
2009-11-20 13:28:12 -08:00
Dirk Dougherty
9aaa087c96 am b11f8a21: am d47fad27: am 055b4392: Merge change I0a17a960 into eclair
Merge commit 'b11f8a216f326a96bbdb08b470a7de8c2fa81edf'

* commit 'b11f8a216f326a96bbdb08b470a7de8c2fa81edf':
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
2009-11-20 13:22:59 -08:00
Dirk Dougherty
b11f8a216f am d47fad27: am 055b4392: Merge change I0a17a960 into eclair
Merge commit 'd47fad27d76527dfa27f6c5425cc4074f6c3a158' into eclair-mr2-plus-aosp

* commit 'd47fad27d76527dfa27f6c5425cc4074f6c3a158':
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
2009-11-20 13:18:25 -08:00
Dirk Dougherty
d47fad27d7 am 055b4392: Merge change I0a17a960 into eclair
Merge commit '055b439289f38c5a1d3bd43c0e218a4cbb93773d' into eclair-mr2

* commit '055b439289f38c5a1d3bd43c0e218a4cbb93773d':
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
2009-11-20 13:13:25 -08:00
Android (Google) Code Review
055b439289 Merge change I0a17a960 into eclair
* changes:
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
2009-11-20 13:08:06 -08:00
Mike Lockwood
1f7b4134db AlarmManagerService: Fix daylight savings time offset computation
Fixes b/2244560 (Time Stamp On Bug Reports And Pictures Is One Hour Off)

Change-Id: I69324a33f80e41ce68a0e6fdba08b80ed9453e19
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-20 15:16:58 -05:00
Yu Shan Emily Lau
ea1862bbf4 am c6bb089d: am 507322ca: am 9ed314ce: Merge change Ib3191441 into eclair
Merge commit 'c6bb089df15c25948757f6dbd9007fc0d49bb568'

* commit 'c6bb089df15c25948757f6dbd9007fc0d49bb568':
  Add the checking for mediaplayer stress test.
2009-11-20 12:13:26 -08:00
Yu Shan Emily Lau
c6bb089df1 am 507322ca: am 9ed314ce: Merge change Ib3191441 into eclair
Merge commit '507322ca5c5b678714314ae87e27d07c89c40785' into eclair-mr2-plus-aosp

* commit '507322ca5c5b678714314ae87e27d07c89c40785':
  Add the checking for mediaplayer stress test.
2009-11-20 12:08:54 -08:00
Yu Shan Emily Lau
507322ca5c am 9ed314ce: Merge change Ib3191441 into eclair
Merge commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-mr2

* commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
  Add the checking for mediaplayer stress test.
2009-11-20 12:03:34 -08:00
Android (Google) Code Review
9ed314cefb Merge change Ib3191441 into eclair
* changes:
  Add the checking for mediaplayer stress test.
2009-11-20 11:59:28 -08:00
Yu Shan Emily Lau
b1ce51fb73 Add the checking for mediaplayer stress test. 2009-11-20 11:55:05 -08:00
Dirk Dougherty
0a056afb71 sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
Bug:2160782
Change-Id: I0a17a9603b53a46a3a434f29bcd72208af1a745b
2009-11-20 11:17:26 -08:00
Android (Google) Code Review
11678ebe25 Merge change I8e7241a9
* changes:
  Make apicheck happy.
2009-11-20 10:48:57 -08:00
Scott Main
021694657b droiddoc change: add flag to offline docs build to signal
that we're building offline docs so that we do not generate
all of the web pages for the sample apps source code.

This depends on change 33762 (sha I06c40454), meaning, this
will break the build without that.

Change-Id: Id2ee762de13f23c3da15d55e763c1838b11ac31c
2009-11-20 10:44:21 -08:00
Scott Main
9c0dc9b5d6 am 60f6b6f8: am 0bbb68fe: am 2a6a149f: am 820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '60f6b6f86f3a8f12f0260c55f7cb40b8f72da941'

* commit '60f6b6f86f3a8f12f0260c55f7cb40b8f72da941':
  docs change for ESD: add samples html pages for offline docs
2009-11-20 10:11:13 -08:00
Scott Main
798e043986 am 7dba47c8: am cb596642: am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '7dba47c866b126d26dec2afe18164ce73016bc46'

* commit '7dba47c866b126d26dec2afe18164ce73016bc46':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 10:10:49 -08:00
Scott Main
60f6b6f86f am 0bbb68fe: am 2a6a149f: am 820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '0bbb68fe290e1c2e4b9c5722fc2dbbd29fc4e336' into eclair-mr2-plus-aosp

* commit '0bbb68fe290e1c2e4b9c5722fc2dbbd29fc4e336':
  docs change for ESD: add samples html pages for offline docs
2009-11-20 10:06:15 -08:00
Scott Main
7dba47c866 am cb596642: am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed' into eclair-mr2-plus-aosp

* commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 10:05:56 -08:00
Andy McFadden
8e7241a95c Make apicheck happy. 2009-11-20 10:04:14 -08:00
Scott Main
0bbb68fe29 am 2a6a149f: am 820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '2a6a149fc2abfb8ef654ed36ce4524209f5e33bc' into eclair-mr2

* commit '2a6a149fc2abfb8ef654ed36ce4524209f5e33bc':
  docs change for ESD: add samples html pages for offline docs
2009-11-20 10:00:55 -08:00
Scott Main
cb5966426a am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-mr2

* commit 'e16113998bb10f39ee1384bfc497aceeeb193440':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 10:00:28 -08:00
Mike Lockwood
347ed410c2 am 9d633968: am 401a712e: IPowerManager: remove some unused methods.
Merge commit '9d633968ceb502e95f9785b169742624f72614f5'

* commit '9d633968ceb502e95f9785b169742624f72614f5':
  IPowerManager: remove some unused methods.
2009-11-20 10:00:16 -08:00
Mike Lockwood
9d633968ce 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
2a6a149fc2 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
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
43bc59e5d1 am 12c90b05: am aa5e25d2: Re-run update-api to fix the build.
Merge commit '12c90b0525d8e97a2fae060f95e9761c0c48c26d'

* commit '12c90b0525d8e97a2fae060f95e9761c0c48c26d':
  Re-run update-api to fix the build.
2009-11-20 03:17:01 -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
fda04eb9aa am c26197e0: am 7caaeecc: Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
Merge commit 'c26197e02cb0dc76d7d621f88f120c1ccfc31c25'

* commit 'c26197e02cb0dc76d7d621f88f120c1ccfc31c25':
  Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
2009-11-20 02:24:03 -08: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
7fee29dafd am 4ee476ef: am 5e332efd: Merge change I903ce7b1 into eclair-mr2
Merge commit '4ee476ef94f7834c18ee378c788abcdb0728954f'

* commit '4ee476ef94f7834c18ee378c788abcdb0728954f':
  Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
2009-11-19 23:23:38 -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
e8eb17e211 am e627a759: am 50b69062: am 57bda83d: Merge change I4f614c9e into eclair
Merge commit 'e627a75974f7d786d7f5f28909e535c09f6cc8b1'

* commit 'e627a75974f7d786d7f5f28909e535c09f6cc8b1':
  Add a test app that has 100 icons.  None of them do anything when clicked.
2009-11-19 21:29:15 -08: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
7e2609fddd am 8e9af2bd: am b439f561: am 13feccf5: Merge change I39f0003e into eclair
Merge commit '8e9af2bd1d600cd2c69c88c7d60c7d455921677e'

* commit '8e9af2bd1d600cd2c69c88c7d60c7d455921677e':
  fix [2235414] libagl glDeleteBuffers() crashes
2009-11-19 19:16:58 -08:00