25651 Commits

Author SHA1 Message Date
Eric Fischer
0e5467f51f Import revised translations. DO NOT MERGE
Change-Id: Iec41808d7f6514cffc67a91e1b243fa063f04089
2010-09-24 10:21:31 -07:00
Andreas Huber
3ac01190a7 Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
Change-Id: I67b287cf76546191f398939aabe4480d9e79a948
2010-09-24 10:09:00 -07:00
Eric Laurent
880dfe4f67 Merge "Fix issue 3007862" into gingerbread 2010-09-24 09:43:24 -07:00
Eric Laurent
98c92599ac Fix issue 3007862
Removed a cross deadlock condition between audioflinger and audio policy
service mutexes.
Audioflinger::createEffect() locks audioflinger mutex and then calls
AudioSystem::getOutputForEffect() which ends up in
AudioPolicyService::getOutputForEffect() which locks audio policy service
mutex. If at the same time, the command thread in audio policy service is
processing a command(set volume, set route...), the mutex is locked and the
command will call one audioflinger method which in turn will attempt to
lock audioflinger mutex.
The fix consists in releasing audioflinger mutex before calling
getOutputForEffect().

Change-Id: Id44e7feb36e0a295731f6aa97cf32d022edd34d0
2010-09-24 09:32:40 -07:00
Fabrice Di Meglio
8f57caf8ed Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)
- force UTC timezone if recurrence is corresponding to an "allday" event

Change-Id: I3603438c0ad8019051ed4a8bd39d4aa7c0401eb1
2010-09-24 09:18:25 -07:00
Kenny Root
ba606d46f4 Revert "Revert "Free created FileMap when uncompressing files""
This revert reverts commit a19ef306bd0a257c67b50f5e0e669e9fe52b0889.
2010-09-24 09:11:28 -07:00
Hung-ying Tyan
3a4197e642 SipAudioCall: remove SipManager dependency.
Change-Id: I2dc8bf427e52f64529ee0e0261362b975a8917c6
2010-09-24 23:27:40 +08:00
Andreas Huber
37155854b4 Merge "Proper sync-frame detection for sources that don't already provide it." into gingerbread 2010-09-24 08:17:20 -07:00
Kenny Root
6458fa0fce Add locking around ZIP seeking
Since we switched to seeking to the LFH to verify its existence instead
of a huge mmap of the file, we have to guarantee that another seek
doesn't happen before we finish our read on the LFH.

Change-Id: If8135d9cb6f2f5cc4db734eafa4f6b5f6269c62a
2010-09-24 08:05:51 -07:00
satok
933fc94ce1 Merge "Use MOTOYA font for Japanese font" into gingerbread 2010-09-24 01:33:23 -07:00
Chia-chi Yeh
658bec9567 SDP: remove dead code.
Change-Id: I2a5764a2b9cabc54b0ac18666e494c1cb39c4e9b
2010-09-24 10:17:42 +08:00
Hung-ying Tyan
84a357bb6a Refactoring SIP classes to get ready for API review.
+ replace SipAudioCall and its Listener interfaces with real implementations,
  + remove SipAudioCallImpl.java, most of it is has become part of SipAudioCall,
+ add SipSession and its Listener classes to wrap ISipSession and ISipSessionListener,
+ move SipSessionState to SipSession.State,
+ make SipManager keep context and remove the context argument from many methods of its,
+ rename SipManager.getInstance() to newInstance(),
+ rename constant names for action strings and extra keys to follow conventions,
+ set thread names for debugging purpose.

Change-Id: Ie1790dc0e8f49c06c7fc80d33fec0f673a9c3044
2010-09-24 10:06:59 +08:00
Mathias Agopian
524a6d8e9b Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread 2010-09-23 18:14:44 -07:00
Steve Howard
a7bfe6ad76 Support "seascape" rotation for "landscape-only" apps
Change-Id: Ibbbd850dc2bfb741b39c04c982fbdd98f3fa4a67
2010-09-23 17:46:41 -07:00
Joe Onorato
cbb7b05e35 Merge "Crash apps when they provide bad notifications instead of crashing the system process." into gingerbread 2010-09-23 16:52:28 -07:00
Joe Onorato
eaa0718780 Crash apps when they provide bad notifications instead of crashing the system process.
Bug: 2958415
Change-Id: I9cbef340fb20a64eca8493950b814399c26ce197
2010-09-23 16:49:20 -07:00
Mathias Agopian
25b388c43b better fix for [3028370] GL get error should return a valid error if no context is bound.
it turns out that we cannot return INVALID_OPERATION from glGetError() because the
GL spec says that it must be called in a loop until it returns GL_NO_ERROR.

now, we always return 0 from GL functions called from a thread with no
context bound. This means that glGetError() will return NO_ERROR in this case,
which is better than returning a random value (which could trap the app in a loop).

if this happens in the main thread of a process, we LOG an error message once.

Change-Id: Id59620e675a890286ef62a257c02b06e0fdcaf69
2010-09-23 16:44:48 -07:00
Robert Greenwalt
8dcc28be06 Move long Connectivity tasks to handler thread.
Reduce ANR potential.
bug:2942829

Change-Id: I21610b462d5ab91821015cd16eecd86d2c0580d1
2010-09-23 16:43:21 -07:00
Chung-yih Wang
f43ac91137 Merge "Handle OPTIONS requests from SIP servers." into gingerbread 2010-09-23 16:36:18 -07:00
Dianne Hackborn
287952c35e Fix issue #3022508: Crash during media scan
Don't kill processes for excessive wake lock use, even if they
are in the background, as long as they have running services.

Also fix some problems with this, such as not noting the kill
in battery stats.

And add killing of processes for cpu usage as well, along with
some optimizations to computing CPU usage.

And fix BatteryWaster to be better behaving for testing these
cases.

Add new "monitor" command to am to watch as the activity manager
does stuff (so we can catch things at the point of ANR).

Finally some miscellaneous debug output for the stuff here, as
well as in progress debugging of an ANR.

Change-Id: Ib32f55ca50fb7486b4be4eb5e695f8f60c882cd1
2010-09-23 15:59:28 -07:00
Joe Onorato
f9ec03c0f5 Make the logging a little more targeted for the status bar multiple icon problem.
Change-Id: I726eef29281dce2a1b900c28ad55bf82cb50449a
2010-09-23 15:11:04 -07:00
Andreas Huber
b51852709c Proper sync-frame detection for sources that don't already provide it.
Change-Id: Iafeee847b015c5cf6bec6dd5fac22a8d3e8cb78e
2010-09-23 15:03:57 -07:00
Dirk Dougherty
f356c4bb3b Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread 2010-09-23 14:58:41 -07:00
Jeff Brown
de04fb0a03 Merge "Enforce serial ordering of MotionEvents." into gingerbread 2010-09-23 14:51:52 -07:00
Kenny Root
7f459df9f9 Merge "Better errors in PackageManagerTests" into gingerbread 2010-09-23 14:27:00 -07:00
Andreas Huber
7b2ed5d7d6 Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly." into gingerbread 2010-09-23 14:16:48 -07:00
Dianne Hackborn
045398e624 Merge "Fix a deadlock I ran into." into gingerbread 2010-09-23 14:15:45 -07:00
Andreas Huber
e7635933b6 Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.
Change-Id: I1423923fafbcac6911218277e2bbfa068e49dcc6
2010-09-23 14:08:32 -07:00
Jeff Brown
93ed4e3052 Enforce serial ordering of MotionEvents.
This change modifies ViewRoot to wait until the MotionEvent has been
delivered before telling the input dispatcher that it is finished.
The serial ordering guarantee will be required by new features that
may need to transfer touch focus from one window to another.

Change-Id: I0a64d1f0c8bc3f08846f213d6e28ce48b1d48e58
2010-09-23 13:56:30 -07:00
Eric Fischer
37cedce14b Merge "Add an aapt option to allow string variations for different devices." into gingerbread 2010-09-23 13:47:06 -07:00
Mathias Agopian
5c6c5c7a43 fix [3028370] GL get error should return a valid error if no context is bound.
glGetError() will now always return GL_INVALID_OPERATION if called from a thread
with no GL context bound.

Change-Id: I28ba458871db051bb4f5a26668a1fa123526869c
2010-09-23 13:19:02 -07:00
Steve Howard
bb0d23b547 Have DownloadManager pass file URIs for legacy external downloads
DownloadManager was set up to return file URIs for public API
downloads to external, but to return content URIs for all others.
This included browser downloads, which are on external but don't go
through the public API.  Since the new downloads UI uses
DownloadManager, it was affected by this change when the user opened a
file from the UI.  Apparently numerous things don't handle content
URIs well, including music preview (clicking on downloaded mp3) and
package installer (clicking on downloaded APK), so this change makes
it generate file URIs for legacy external downloads.

Change-Id: I5c34d8ba188cc8b0d11865262cb451208be78eae
2010-09-23 12:45:28 -07:00
Steve Howard
4f564cdeb8 Tweaks to download manager API based on API review feedback
* improved documentation of the default destination on the download
  cache and the concomitant consequences

* removed NETWORK_WIMAX flag for setting allowed networks

* changed request headers behavior to support multiple instances of
  the same header (as allowed in the HTTP spec), renamed
  setRequestHeader() to addRequestHeader()

* accept user-facing strings as CharSequences instead of Strings

* new convenience methods setDestinationInExternalFilesDir() and
  setDestinationInExternalPublicDir() for setting a destination in
  either shared or app-private external storage directories

* renamed setMediaType() to setMimeType()

Change-Id: I8781e2214d939c340209cab917bbbba264ab919c
2010-09-23 12:42:34 -07:00
Dirk Dougherty
9a97aaf72b Doc change: ADT 0.9.9 version notes, size/sum update.
Change-Id: I824da2911e782b0eec1e684a1982750ac308977b
2010-09-23 11:48:54 -07:00
Scott Main
2dc43f3d4c am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo
Merge commit '5b7328f257a76ff6b7b60872d6a106002ff1f679' into gingerbread

* commit '5b7328f257a76ff6b7b60872d6a106002ff1f679':
  docs: add more info about state list drawable and onclick attribute to Button
2010-09-23 11:41:48 -07:00
Dirk Dougherty
5ee00e22b9 am 27de3a24: (-s ours) Doc change: ADT 0.9.9 version notes, size/sum update.
Merge commit '27de3a240fcf6e5cdd1b228fa11ffcb4fdc73866' into gingerbread

* commit '27de3a240fcf6e5cdd1b228fa11ffcb4fdc73866':
  Doc change: ADT 0.9.9 version notes, size/sum update.
2010-09-23 11:37:33 -07:00
Scott Main
5b7328f257 Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 2010-09-23 11:23:48 -07:00
Kenny Root
94e0acbf2f Better errors in PackageManagerTests
PackageManagerTests was catching assertion errors and just spitting out
a generic "Hey, there was an error!" message. This eliminates that and
adds some expected outcomes in the assertions.

Change-Id: I27baa3c57c85b0cae4ea76aaf1e2a9b61b2c32b7
2010-09-23 11:11:46 -07:00
Eric Laurent
7864c72b91 Merge "Fix issue 3022800." into gingerbread 2010-09-23 11:07:06 -07:00
Eric Laurent
1a5149e5d7 Fix issue 3022800.
- Created sub-package android.media.audiofx for audio effects.
- Hid AudioEffect class contructor, methods and variables not needed by
applications
- Added more javadoc comments for AudioEffect Class

Change-Id: Ibbb40d4e714bb248aa32cf82d7763d74efae96d1
2010-09-23 11:04:03 -07:00
Amith Yamasani
6e98c280f7 Merge "Fix for IndexOutOfBounds in setComposingRegion." into gingerbread 2010-09-23 11:03:49 -07:00
Eric Fischer
90964040ca Add an aapt option to allow string variations for different devices.
The --product option to aapt is a comma-separated list of characteristics
of the device being built for.  For example, --product nosdcard,grayscale
for a device with no SD card and a grayscale screen.

Strings can specify a product="characteristic" option to cause that version
of the string to be used only for that type of device.  All such strings
should also specify, at the end of the block, product="default", which
will be used if none of the variations match.  For example:

<string name="choose" product="bw">Choose black or white</string>
<string name="choose" product="grayscale">Choose a shade of gray</string>
<string name="choose" product="default">Choose a color</string>

The default characteristic will also be used when no --product option
is specified.

Change-Id: Ie6c1505599e02e15b7818e8be6ec47bc6ce71aaa
2010-09-23 10:32:47 -07:00
Joe Onorato
49a8bbf4ea Don't crash if we've never gotten a signal strength update.
It looks like this timing bug has been there forever, and we're just starting to hit it now.

Bug: 3027952
Change-Id: I5c14ccd7f74205dc6930f4282cec0e23eeb54cab
2010-09-23 10:31:00 -07:00
Dirk Dougherty
27de3a240f Doc change: ADT 0.9.9 version notes, size/sum update.
Change-Id: I08ebfa95b0735964a888a89931a1f4c3bdf1862c
2010-09-23 10:25:24 -07:00
James Dong
903fc22106 Ignore errors from correction parameter query and config for M4v and H263 encoders
This feature is not essential for camcorder application

Change-Id: Id560632207dcf24fe361280ebe8178ea7332f22d
2010-09-23 10:12:45 -07:00
James Dong
697bd76e42 Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread 2010-09-23 10:11:04 -07:00
Chung-yih Wang
0b4d2fb114 Handle OPTIONS requests from SIP servers.
Change-Id: I849d5ea4c4c56a06d25ccdc6b959274c59c47200
2010-09-24 00:53:10 +08:00
Robert Greenwalt
e87ebb08fb Merge "Cleanup Netd to prevent getting hung." into gingerbread 2010-09-23 08:41:21 -07:00
repo sync
0b7d6de155 Fix the build.
Change-Id: I82210cb2d41f532583f83ea17e6f2d8d49280a30
2010-09-23 14:52:24 +08:00
repo sync
75c3853ec5 Merge changes I7efff4f2,I1631ee20,I14d9886a,Ic2858920,Iff588130,I37ba9d83 into gingerbread
* changes:
  SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
  SDP: Add a simple class to help manipulate session descriptions.
  RTP: Add log throttle for "no data".
  RTP: Update native part to reflect the API change.
  RTP: Add two getters to retrieve the current configuration from AudioStream.
  RTP: Extend codec capability and update the APIs.
2010-09-22 23:14:15 -07:00