16942 Commits

Author SHA1 Message Date
Andreas Huber
db5d662254 Properly respect NALLengthSize in the AVC Configuration header to determine how many bits encode the nal unit size.
related-to-bug: 2363596
2010-01-12 16:30:44 -08:00
Andreas Huber
c2096a1ff7 Merge "Make sure to release the buffer we're not using in case of an error." 2010-01-12 12:20:52 -08:00
Andreas Huber
5c1fe318eb Make sure to release the buffer we're not using in case of an error.
related-to-bug: 2366606
2010-01-12 11:58:28 -08:00
Grace Kloba
ec24e7d3a8 am ba5220fc: (-s ours) am ce63c639: Merge "DO NOT MERGE." into eclair
Merge commit 'ba5220fc0c19c1efb65f6855e6b0bf680c30b6e8'

* commit 'ba5220fc0c19c1efb65f6855e6b0bf680c30b6e8':
  DO NOT MERGE.
2010-01-12 11:57:02 -08:00
Jean-Baptiste Queru
1c993bfb62 Merge "resolved conflicts for merge of d26707da to master" 2010-01-12 11:55:12 -08:00
Jean-Baptiste Queru
fa101530bc resolved conflicts for merge of d26707da to master
Change-Id: I1a379194f70c4b14191333ca2d8e6dd9d8b0f9dd
2010-01-12 11:53:42 -08:00
Bjorn Bringert
32db57babe Merge "Add and expose SearchManager.getSearchableInfo()" 2010-01-12 11:21:27 -08:00
Makoto Onuki
8f028a94fc Moved DomainNameChecker to android common.
- Moved DomainNameChecker from android.net.http to android common, and renamed to DomainNameValidator.
- Added a simplified version of DNParser, which DomainNameValidator uses instead of X509Name in order to extract Subject Name from a certificate.
- Added unit tests for DomainNameChecker and DNParser.

There's a suspicious comment in DomainNameChecker saying something like "X509Certificate fails to parse a certificate when a subject alt name begins with '*'".  I think we should fix it if it's really the case -- otherwise certificates with the wildcard wouldn't work.  I'll see if it's true after submitting this patch.
2010-01-12 10:27:13 -08:00
Grace Kloba
ba5220fc0c am ce63c639: Merge "DO NOT MERGE." into eclair
Merge commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0' into eclair-plus-aosp

* commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0':
  DO NOT MERGE.
2010-01-12 10:02:48 -08:00
San Mehat
d26707da89 am c93c70c4: Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair
Merge commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0' into eclair-plus-aosp

* commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0':
  framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
2010-01-12 10:02:40 -08:00
Grace Kloba
ce63c639e9 Merge "DO NOT MERGE." into eclair 2010-01-12 10:00:03 -08:00
San Mehat
c93c70c4b8 Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair 2010-01-12 09:59:35 -08:00
Grace Kloba
e67d5cee67 DO NOT MERGE.
Couple of tweak for multi-touch in WebView.

1. If we can't zoom, don't get in multitouch mode.
   This avoid the logo in google.com looks fuzzy.
2. Reset mAnchor after sending VIEW_SIZE_CHANGED.
3. Don't call zoom when finishing multitouch unless
   zoom is called before.
4. Change the width for nativeSetSize, which was modified
   in the last check-in. The new logic should make both
   msn.com and news.google.com looks correct.
5. Use the pressure instead of distance/time to filter
   out the jitter just before lifting the finger.

Fix http://b/issue?id=2360032
2010-01-12 09:58:43 -08:00
Andreas Huber
aee3c6394a Squashed commit of the following:
commit f81bb1dac5ef107bb0d7d5d756fb1ffa532ba2cc
Author: Andreas Huber <andih@google.com>
Date:   Mon Jan 11 14:55:56 2010 -0800

    Support for duration metadata, midi and ogg-vorbis files (in mediascanner)

commit 0b1385a0dc156ce27985a1ff757c4c142fd7ec39
Author: Andreas Huber <andih@google.com>
Date:   Mon Jan 11 14:20:45 2010 -0800

    Refactor meta data logic. Container specific metadata is now also returned by the MediaExtractor.

commit f9818dfac39c96e5fefe8c8295e60580692d5990
Author: Andreas Huber <andih@google.com>
Date:   Fri Jan 8 14:26:09 2010 -0800

    A first pass at supporting metadata through ID3 tags.

commit 476e9e253633336ab790f943e2d6c0cd8991d76a
Author: Andreas Huber <andih@google.com>
Date:   Thu Jan 7 15:48:44 2010 -0800

    Initial checkin of ID3 (V2.2 and V2.3) parser for use in stagefright.

related-to-bug: 2295456
2010-01-12 09:14:15 -08:00
Andrei Popescu
93aea69649 Merge "Implement timeupdate events for video tag." 2010-01-12 08:17:27 -08:00
Andrei Popescu
048eb3bfa1 Implement timeupdate events for video tag.
Fix http://b/issue?id=2210105
2010-01-12 16:13:52 +00:00
San Mehat
7ebf017658 framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
Signed-off-by: San Mehat <san@google.com>
2010-01-12 07:57:42 -08:00
Niko Catania
45b7629afd Merge "Fix the CallerInfo lookup when a phone URL is used." 2010-01-12 07:55:27 -08:00
Bjorn Bringert
0408675d87 Add and expose SearchManager.getSearchableInfo()
This method is needed by QuickSearchBox to get the searchability
meta-data for an activity.

Change-Id: I1b7a72d4dde1ff15410288cfdc33c043738be977
2010-01-12 15:50:04 +00:00
Cary Clark
bad0c54de9 rebuild the nav cache if the clicked on node is invalid
Rebuild the nav cache in the webkit thread after determining
that the clicked on node isn't valid. Remove old code that
passed a flag to avoid using the invalid node, since it
should always be valid now.

requires a companion fix in external/webkit

fixes http://b/2362334
2010-01-12 09:18:08 -05:00
Joe Onorato
f523609e8d stop crashing. I'm not sure what triggered this. 2010-01-11 20:15:46 -05:00
Jim Miller
58f24686dc Merge "Fix 2332563: Add password-lock support to lockscreen" 2010-01-11 17:12:13 -08:00
Romain Guy
5c7a5d0857 Merge "Fix how RelativeLayout handles alignParentBottom/Right when dimension is wrap_content. Bug: #2194109." 2010-01-11 16:48:10 -08:00
Romain Guy
42460ac1bb Fix how RelativeLayout handles alignParentBottom/Right when dimension is wrap_content.
Bug: #2194109.
2010-01-11 16:47:30 -08:00
Grace Kloba
bb4ad6a8a3 Merge "As setNewZoomScale is called asynchronously, the WebView can be destroyed. If it is, skip scaling." 2010-01-11 16:35:32 -08:00
Andreas Huber
593c6a5516 Merge "The mp3 decoder should not assert that decoding was successful but return an error instead." 2010-01-11 16:08:56 -08:00
Tom O'Neill
25391832fc Merge "Improve ContactsContract documentation, esp. of Data inner class" 2010-01-11 15:59:36 -08:00
Nicolas Catania
c72509b4d8 Fix the CallerInfo lookup when a phone URL is used.
Typically the CallerInfo is looked up based on a phone number, in which case the '_id' column
contains the contact id.

However when the lookup is based on a phone row, the '_id' column is the row number we queried.
The contact id is stored somewhere else in a 'contact_id' column.

The current fix, checks the mime type of the contactRef URL to find out which column contains
the contact id.
I think the contact DB should be more consistent and always return the contact id AS contact_id even
in the phone number scenario.

Bug:2269240
2010-01-11 15:58:10 -08:00
Jim Miller
69aa4a953f Fix 2332563: Add password-lock support to lockscreen 2010-01-11 15:50:39 -08:00
Tom O'Neill
244327e209 Improve ContactsContract documentation, esp. of Data inner class
Provide some missing javadoc, make some things a little more explicit, etc.

Change-Id: Ibcdeaa10c641436009a3494b18cecae6f816b75e
2010-01-11 15:49:59 -08:00
Grace Kloba
4c7ec8d6ab As setNewZoomScale is called asynchronously, the
WebView can be destroyed. If it is, skip scaling.

Fix http://b/issue?id=2366538
2010-01-11 15:36:37 -08:00
Xavier Ducrohet
6d40ee33f5 am f5a84f8a: am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair
Merge commit 'f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8'

* commit 'f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8':
  LayoutLib: support for custom styles.
2010-01-11 15:30:29 -08:00
Xavier Ducrohet
f5a84f8a7f am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair
Merge commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e' into eclair-plus-aosp

* commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e':
  LayoutLib: support for custom styles.
2010-01-11 15:28:07 -08:00
Xavier Ducrohet
dfe25b0e0c Merge "LayoutLib: support for custom styles." into eclair 2010-01-11 15:25:16 -08:00
Dan Egnor
6ee699102f Merge "Simplify & update ANR logging; report ANR data into the dropbox. Eliminate the per-process 200ms timeout during ANR thread-dumping. Dump all the threads at once, then wait for the file to stabilize. Seems to work great and is much, much, much faster." 2010-01-11 15:09:51 -08:00
Andreas Huber
b6d5d1b7b3 Merge "Fix an uninitialized read detected by valgrind. The array to be copied is statically sized and not a c-string." 2010-01-11 14:56:39 -08:00
Dan Egnor
42471dd555 Simplify & update ANR logging; report ANR data into the dropbox.
Eliminate the per-process 200ms timeout during ANR thread-dumping.
Dump all the threads at once, then wait for the file to stabilize.
Seems to work great and is much, much, much faster.

Don't dump stack traces to traces.txt on app crashes (it isn't very
useful and mostly just clutters up the file).

Tweak the formatting of the dropbox dumpsys a bit, for readability,
and avoid running out of memory when dumping large log files.

Report build & kernel version with kernel log dropbox entries.
2010-01-11 14:51:22 -08:00
Xavier Ducrohet
9ce3b775f5 LayoutLib: support for custom styles.
Change-Id: Ic6c2ef234589f45db15024261d698066aa6e2f4e
2010-01-11 14:28:03 -08:00
Jean-Michel Trivi
17acf1747f Merge "Apply EQ on the output of the speech synthesis only when using the Pico TTS engine." 2010-01-11 14:26:17 -08:00
Jaikumar Ganesh
1f3856c446 am 495d820c: am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it.
Merge commit '495d820c0124a811b9352b93ce4fe88c716f259d'

* commit '495d820c0124a811b9352b93ce4fe88c716f259d':
  Don't set priority in Bonding state.
2010-01-11 14:23:18 -08:00
Tom Taylor
6e106ff7b4 am 2bb1f870: am 1edd8277: Merge "Hide unused fields" into eclair
Merge commit '2bb1f87089faa14954c1b5afa92a34ea947f5ff6'

* commit '2bb1f87089faa14954c1b5afa92a34ea947f5ff6':
  Hide unused fields
2010-01-11 14:23:09 -08:00
Andreas Huber
afce2158a2 The mp3 decoder should not assert that decoding was successful but return an error instead. 2010-01-11 14:21:26 -08:00
Jaikumar Ganesh
495d820c01 am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it.
Merge commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp

* commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e':
  Don't set priority in Bonding state.
2010-01-11 14:20:53 -08:00
Jaikumar Ganesh
ccaebfc942 Don't set priority in Bonding state.
This was causing A2DP get connected for Car Docks, when user didn't select it.

Bug: 2364328
Dr No: Eastham
2010-01-11 14:16:29 -08:00
Jean-Michel Trivi
0320f8bdfb Apply EQ on the output of the speech synthesis only when using the Pico
TTS engine.
2010-01-11 14:16:28 -08:00
Tom Taylor
2bb1f87089 am 1edd8277: Merge "Hide unused fields" into eclair
Merge commit '1edd8277440c83ef44e0128e86afb8c002e49b17' into eclair-plus-aosp

* commit '1edd8277440c83ef44e0128e86afb8c002e49b17':
  Hide unused fields
2010-01-11 14:15:51 -08:00
Derek Sollenberger
c408d5c278 am 1fed31aa: am fef4874a: fixing build break by removing unused imports.
Merge commit '1fed31aa81f769db308f6d92b0530ad52fa79ca8'

* commit '1fed31aa81f769db308f6d92b0530ad52fa79ca8':
  fixing build break by removing unused imports.
2010-01-11 14:14:28 -08:00
Tom Taylor
1edd827744 Merge "Hide unused fields" into eclair 2010-01-11 14:11:46 -08:00
Trevor Johns
9cebb377c5 am 18dedf2c: am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair
Merge commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a'

* commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
2010-01-11 14:08:15 -08:00
Trevor Johns
18dedf2cdf am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair
Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp

* commit '50a3977c619be113bb35fb7fd53874effad6dbe4':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
2010-01-11 14:05:55 -08:00