Commit Graph

38903 Commits

Author SHA1 Message Date
Wink Saville
04e71b3db8 AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
2009-04-02 11:00:54 -07:00
Grace Kloba
029a8c38c6 Merge branch 'readonly-p4-master' 2009-04-02 10:56:49 -07:00
Grace Kloba
3afdd56470 AI 144242: Fix 1750062. When createCacheFile, if we get 303, or redirect with cookies, or "no-store", make sure to remove the existing entry in the cache db before returning null for CachedResult.
BUG=1750062

Automated import of CL 144242
2009-04-02 10:55:37 -07:00
Leon Scroggins
c9222aa0f2 Merge branch 'readonly-p4-master' 2009-04-02 10:49:03 -07:00
Leon Scroggins
238ddbb8a2 AI 144235: Fix for 1752906: clicking "cancel" on a multiple <select> element disables future select elements from working. Add a listener for cancel, which will clear out the old popup, and allow a new one to be brought up in the future.
BUG=1752906

Automated import of CL 144235
2009-04-02 10:47:53 -07:00
Daisuke Miyakawa
506e0078b2 Merge branch 'readonly-p4-master' 2009-04-02 10:45:40 -07:00
Daisuke Miyakawa
eb3e3e368a AI 144210: am: CL 144182 am: CL 144181 Modify ProgressDialog class and its xml so that it follows the
Android's UI guide line. This modification is based on leland's mock.
  See http://b/issue?id=1748136 for more information.
  Put ProgressNumber left side, next to ProgressPercentage.
  Make ProgressPercentage Bold.
  Put ProgressNumber and ProgressPercentage near to the ProgressBar
  above. This is same as the design of Market application.
  Enable ProgressDialog change the ProgressNumber format. This is hidden
  since the interface is premature.
  Original author: dmiyakawa
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144210
2009-04-02 10:44:31 -07:00
Ray Chen
4f6e3db3dd Merge branch 'readonly-p4-master' 2009-04-02 10:43:05 -07:00
Ray Chen
43ca00b0e8 AI 144209: am: CL 144176 To fix the race condition in case "requestCancelDecode"
happens earlier than AutoDecoderCancel object is added
  to the gAutoDecoderCancelMutex linked list.
  Original author: raychen
  Merged from: //branches/donutburger/...

Automated import of CL 144209
2009-04-02 10:41:55 -07:00
Nick Pelly
20f07d406f Merge branch 'readonly-p4-master' 2009-04-02 10:31:50 -07:00
Nick Pelly
f1b083fb85 AI 144205: am: CL 144151 am: CL 144150 Fix heap corruption.
Take mutex in close(), and skip write path after turning bluetooth off.
  Original author: npelly
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144205
2009-04-02 10:30:39 -07:00
Chris Tate
ff9602a75b Merge branch 'readonly-p4-master' 2009-04-02 10:16:05 -07:00
Chris Tate
31c95fcd8f AI 144139: am: CL 144135 am: CL 144134 Fix issue 1750132 - SensorManager listener 'rate' parameter units are undocumented
Original author: ctate
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144139
2009-04-02 10:15:00 -07:00
Jack Palevich
8b5f56675b Merge branch 'readonly-p4-master' 2009-04-02 10:10:59 -07:00
Jack Palevich
84d8d693bd AI 144129: Remove hidden class android.os.Exec.
Change BugReportService to use java.os.ProcessBuilder instead.
  Remove unused import from DumpStateReceiver.
  An earlier change list created a private copy of this class for Term.
  BUG=1750582

Automated import of CL 144129
2009-04-02 10:09:47 -07:00
Brett Chabot
df07e69e26 Merge branch 'readonly-p4-master' 2009-04-02 09:57:46 -07:00
Brett Chabot
ff51fe211d AI 144107: am: CL 144098 am: CL 144093 Fix NPE in ActivityUnitTestCase.
Original author: brettchabot
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144107
2009-04-02 09:56:38 -07:00
Robert Greenwalt
d30b2568cd AI 144241: Stop polling dbus.
BUG=1244263

Automated import of CL 144241
2009-04-02 09:53:35 -07:00
Eric Laurent
070410ec7f Merge branch 'readonly-p4-master' 2009-04-02 09:33:55 -07:00
Eric Laurent
3547cc0124 AI 144097: am: CL 144054 am: CL 144053 Fix issue #1751242 A2DP playback fails first time: Invalid buffer size: minFrameCount 10240, frameCount 4800
The problem comes from the fact that AudioSystem::getOutputFrameCount() calls getOutput() to retrieve the active output (A2DP or Hardware) before calling get_audio_flinger(). If it is the first time AudioSystem::getOutputFrameCount() is called in a given process, getOutput() will return a wrong value because gA2dpEnabled has not yet been updated by get_audio_flinger().
  The fix consists in calling get_audio_flinger() in getOutput() to be sure that gA2dpEnabled is valid when getOutput() reads it.
  Original author: elaurent
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144097
2009-04-02 09:32:43 -07:00
Doug Zongker
5c7e83fe06 Merge branch 'readonly-p4-master' 2009-04-02 09:25:56 -07:00
Doug Zongker
32a5a24b3f AI 144094: am: CL 144044 First cut of tunneling HTTP requests over gtalk connection:
- We define HttpRequest and HttpResponse protocol buffers.
  The RMQ mechanism is *not* used for these (though the
  messages define rmq id fields in case we want to start).
  - GTalkHttpClient will send an http request over the
  connection to MCS if:
  - gtalk_tunnel_http in gservices is turned on
  - the request destination is the android proxy
  - it can make a connection to gtalkservice
  The request falls back to using GoogleHttpClient if it can't
  be processed over the MCS connection.
  A few shortcuts are taken with cookie handling, but these
  are okay for the envisioned usage.
  Original author: dougz
  Merged from: //branches/donutburger/...

Automated import of CL 144094
2009-04-02 09:24:44 -07:00
Romain Guy
aaf25b5a66 Merge branch 'readonly-p4-master' 2009-04-02 09:20:36 -07:00
Romain Guy
7fb60b9b4e AI 144080: No need to merge. Fix the build.
Automated import of CL 144080
2009-04-02 09:19:22 -07:00
Bjorn Bringert
40c9703639 Merge branch 'readonly-p4-master' 2009-04-02 09:17:54 -07:00
Bjorn Bringert
3a184efa12 AI 144034: am: CL 144032 Added missing import to fix breakage caused by CL 144008.
Original author: bringert
  Merged from: //branches/donutburger/...

Automated import of CL 144034
2009-04-02 09:16:44 -07:00
Mike Reed
f3ea98037e Merge branch 'readonly-p4-master' 2009-04-02 09:07:27 -07:00
Mike Reed
8ba88775fe AI 144018: change path to return its internal cached bounds, making it much lighter-weight to get the bounds.
BUG=1748928

Automated import of CL 144018
2009-04-02 09:06:19 -07:00
Romain Guy
5a2f463fe5 Merge branch 'readonly-p4-master' 2009-04-02 09:04:51 -07:00
Romain Guy
10b4043c99 AI 144014: am: CL 144013 Rename PoolFactory to Pools, to follow the java.util convention (Collections, Arrays.)
Original author: romainguy
  Merged from: //branches/donutburger/...

Automated import of CL 144014
2009-04-02 09:03:39 -07:00
Bjorn Bringert
ffe5e10801 Merge branch 'readonly-p4-master' 2009-04-02 09:02:11 -07:00
Bjorn Bringert
5d015d7331 AI 144010: am: CL 144008 UriMatcher: Avoid repeated calls to Uri.getPathSegments()
in UriMatcher.match().
  Before, every call to UriMatcher.match() called
  Uri.getPathSegments() N + 1 times,
  where N is the size of the list returned by
  Uri.getPathSegments(). Since some of the implementations
  of Uri.getPathSegments() are O(N), UriMatcher.match() was O(N^2).
  This CL fixes the problem by calling uri.getPathSegments() once in
  the beginning of match(). That should be safe since Uri is
  immutable.
  Original author: bringert
  Merged from: //branches/donutburger/...

Automated import of CL 144010
2009-04-02 09:00:58 -07:00
Jean-Baptiste Queru
17b709c90f Merge branch 'readonly-p4-master' 2009-04-02 08:59:23 -07:00
Jean-Baptiste Queru
c7cdd292c4 AI 144009: am: CL 144007 am: CL 144006 Set a real 3.xml, which is the current candidate cupcake API.
This allows work done in later codelines to have proper
  backward-compatibility checks.
  Original author: jbq
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144009
2009-04-02 08:58:10 -07:00
Jeffrey Sharkey
5ed0ea8dbd Merge branch 'readonly-p4-master' 2009-04-02 08:56:44 -07:00
Jeffrey Sharkey
95a1b260fc AI 144005: Fix auto-merge method duplication that broke build.
Automated import of CL 144005
2009-04-02 08:55:32 -07:00
Tadashi Takaoka
6bbccae9b3 Merge branch 'readonly-p4-master' 2009-04-02 08:54:08 -07:00
Tadashi Takaoka
f26c6617a9 AI 144003: am: CL 144002 am: CL 144001 Fix tiny bug in Rfc822Token.java
Original author: takaoka
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144003
2009-04-02 08:52:56 -07:00
Grace Kloba
3c44286190 Merge branch 'readonly-p4-master' 2009-04-02 08:51:31 -07:00
Grace Kloba
a72cc098e2 AI 144000: am: CL 143999 am: CL 143998 Fix #1750489. Call WebKit's setNetworkOnLine from WebCore thread instead of UI thread as WebKit is not thread safe.
Using the same code pattern as the rest of the file:
  . throw IllegalStateException if BrowserFrame.sJavaBridge is null in pauseTimers/resumeTimers.
  . use (msg.arg1 == 1) to pass the boolean from WebView to WebViewCore as in CLEAR_CACHE
  Original author: klobag
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144000
2009-04-02 08:50:17 -07:00
Mike Lockwood
570d05f776 AI 144221: Fix typo in Javadoc
Automated import of CL 144221
2009-04-02 05:27:16 -07:00
Wink Saville
37c124c3fa AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
2009-04-02 01:37:02 -07:00
Wink Saville
767a662ecd AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
2009-04-02 01:37:02 -07:00
Daisuke Miyakawa
e9c08056fa AI 144182: am: CL 144181 Modify ProgressDialog class and its xml so that it follows the
Android's UI guide line. This modification is based on leland's mock.
  See http://b/issue?id=1748136 for more information.
  Put ProgressNumber left side, next to ProgressPercentage.
  Make ProgressPercentage Bold.
  Put ProgressNumber and ProgressPercentage near to the ProgressBar
  above. This is same as the design of Market application.
  Enable ProgressDialog change the ProgressNumber format. This is hidden
  since the interface is premature.
  Original author: dmiyakawa
  Merged from: //branches/cupcake/...

Automated import of CL 144182
2009-04-02 01:34:15 -07:00
Ray Chen
0a6a0e9e95 AI 144176: To fix the race condition in case "requestCancelDecode"
happens earlier than AutoDecoderCancel object is added
  to the gAutoDecoderCancelMutex linked list.
  BUG=1692286

Automated import of CL 144176
2009-04-02 01:31:49 -07:00
Nick Pelly
0827c81466 AI 144151: am: CL 144150 Fix heap corruption.
Take mutex in close(), and skip write path after turning bluetooth off.
  Original author: npelly
  Merged from: //branches/cupcake/...

Automated import of CL 144151
2009-04-02 01:21:13 -07:00
Daisuke Miyakawa
196677cf8c AI 144181: Modify ProgressDialog class and its xml so that it follows the
Android's UI guide line. This modification is based on leland's mock.
  See http://b/issue?id=1748136 for more information.
  Put ProgressNumber left side, next to ProgressPercentage.
  Make ProgressPercentage Bold.
  Put ProgressNumber and ProgressPercentage near to the ProgressBar
  above. This is same as the design of Market application.
  Enable ProgressDialog change the ProgressNumber format. This is hidden
  since the interface is premature.
  BUG=1748136,1612476

Automated import of CL 144181
2009-04-01 19:14:59 -07:00
Nick Pelly
de810e407c AI 144150: Fix heap corruption.
Take mutex in close(), and skip write path after turning bluetooth off.
  BUG=1751710

Automated import of CL 144150
2009-04-01 16:40:01 -07:00
Chris Tate
5a0cb42f3f AI 144135: am: CL 144134 Fix issue 1750132 - SensorManager listener 'rate' parameter units are undocumented
Original author: ctate
  Merged from: //branches/cupcake/...

Automated import of CL 144135
2009-04-01 16:01:18 -07:00
Chris Tate
d7c1f5d0dd AI 144134: Fix issue 1750132 - SensorManager listener 'rate' parameter units are undocumented
BUG=1750132

Automated import of CL 144134
2009-04-01 15:59:29 -07:00