Commit Graph

399 Commits

Author SHA1 Message Date
Jean-Michel Trivi
73cf2a11eb Merge branch 'readonly-p4-master' 2009-04-02 23:27:19 -07:00
Jean-Michel Trivi
e398e3bf22 AI 144409: am: CL 144327 am: CL 144326 Start the thread that initializes the camera for the test under lock to make sure the monitor is notified after it has started waiting.
Original author: jmtrivi
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144409
2009-04-02 23:26:11 -07:00
Xia Wang
e7e370369d Merge branch 'readonly-p4-master' 2009-04-02 23:22:15 -07:00
Xia Wang
74e77fba25 AI 144407: am: CL 144314 am: CL 144313 Add two test cases for AudioTrack.java
getMinBufferSize() returns ERROR_BAD_VALUE if
  sampleRateInHz < 4000 or > 48000.
  Original author: xiaw
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144407
2009-04-02 23:21:07 -07:00
Suchi Amalapurapu
8920894814 Merge branch 'readonly-p4-master' 2009-04-02 23:19:43 -07:00
Suchi Amalapurapu
c700c70ccd AI 144406: am: CL 144309 am: CL 144308 aapt extensions: required sdk version, dependent software libraries, gadgets
Add new attributes for sdk version, software libs and gadgets
  BUG = 1730924
  Original author: asuchitra
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144406
2009-04-02 23:18:34 -07:00
Chris Tate
93e7e3b671 Merge branch 'readonly-p4-master' 2009-04-02 23:17:06 -07:00
Chris Tate
a34df8a2ba AI 144405: am: CL 144307 am: CL 144306 Fix SDK issue 1716562 - Broadcast mechanism documentation should be improved.
Original author: ctate
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144405
2009-04-02 23:15:58 -07:00
Jack Palevich
d153731d1e Merge branch 'readonly-p4-master' 2009-04-02 23:06:30 -07:00
Jack Palevich
5cb6f988b2 AI 144401: am: CL 144282 Tweak this tool to work with the current directory structure.
Also leave the "generated" directory around if it contains files that
  need to be checked in.
  Original author: jackpal

Automated import of CL 144401
2009-04-02 23:05:05 -07:00
Amith Yamasani
9bb6ef5ad3 Merge branch 'readonly-p4-master' 2009-04-02 22:50:23 -07:00
Amith Yamasani
3e276b18b4 AI 144395: am: CL 144257 am: CL 144256 Need to show opt-in screen for location collection.
Added a screen to the setup wizard, after login, to ask user to
  opt-in for location collection.
  Added a dialog to Settings when user turns on Network location.
  Fixed a security permission issue in LocationManagerService related
  to this change.
  Original author: yamasani
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144395
2009-04-02 22:49:19 -07:00
Robert Greenwalt
494204d66b Merge branch 'readonly-p4-master' 2009-04-02 22:42:34 -07:00
Robert Greenwalt
28d139fa95 AI 144392: am: CL 144241 Stop polling dbus.
Original author: rgreenwalt

Automated import of CL 144392
2009-04-02 22:41:08 -07:00
Mike Lockwood
b77f2b51d7 Merge branch 'readonly-p4-master' 2009-04-02 22:34:31 -07:00
Mike Lockwood
460ae0c910 AI 144389: am: CL 144221 Fix typo in Javadoc
Original author: lockwood

Automated import of CL 144389
2009-04-02 22:33:27 -07:00
The Android Open Source Project
d3af727927 Merge branch 'readonly-p4-master'
Conflicts:

	telephony/java/com/android/internal/telephony/gsm/RIL.java
  resolved by removing gsm/RIL.java
2009-04-02 12:18:20 -07:00
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
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