17067 Commits

Author SHA1 Message Date
Andreas Huber
85fbfee4c9 Merge "Properly respect NALLengthSize in the AVC Configuration header to determine how many bits encode the nal unit size." 2010-01-12 16:42:47 -08:00
Ying Wang
ffebd7c2cc am b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair
Merge commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d'

* commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d':
  Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
2010-01-12 16:37:31 -08:00
Ying Wang
b4f4111904 am a1d08886: Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair
Merge commit 'a1d08886ec8549878ad16c19754a3239706fb61b' into eclair-plus-aosp

* commit 'a1d08886ec8549878ad16c19754a3239706fb61b':
  Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
2010-01-12 16:34:13 -08:00
Ying Wang
a1d08886ec Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair 2010-01-12 16:31:14 -08:00
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
Ying Wang
4199528aab Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
Before this change, aapt generates proguard keep flags like
"-keep class com.android.somepackage.", which proguard doesn't recognize.
2010-01-12 16:08:23 -08:00
Daisuke Miyakawa
4a4b6e0d46 Merge "Handle null correctly." 2010-01-12 15:47:00 -08:00
Jason Sams
b9c56e3968 Merge "Implement type generation for user uniforms in vertex shader." 2010-01-12 15:39:57 -08:00
Daisuke Miyakawa
9030dd125a Handle null correctly.
Bug: 2353544
2010-01-13 08:31:27 +09:00
Marco Nelissen
9643b1e49c Merge "b/2353646 Fix music visualizations to also work with audiotrack callbacks, which stagefright uses. This slightly changes the way the data is stored, since before we were relying on the buffers being written always being at least 4K, whereas the callbacks are generally for smaller amounts of data. Now we append all the data to a big circular buffer, then return chunks of that buffer for visualization. When there are multiple things playing at the same time, this will give the wrong result, but (1) that was the case before as well, and (2) will be fixed once we start visualizing the mixer output instead of the mixer inputs." 2010-01-12 15:28:50 -08:00
Adam Powell
908c48587d am 202a6734: am 8acdb201: Added TransformGestureDetector (still in progress) Modified VelocityTracker to track multiple pointers Added TransformTest
Merge commit '202a6734fd39289257955d404edf7a1165f6e480'

* commit '202a6734fd39289257955d404edf7a1165f6e480':
  Added TransformGestureDetector (still in progress)
2010-01-12 15:19:28 -08:00
Adam Powell
202a6734fd am 8acdb201: Added TransformGestureDetector (still in progress) Modified VelocityTracker to track multiple pointers Added TransformTest
Merge commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164' into eclair-plus-aosp

* commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164':
  Added TransformGestureDetector (still in progress)
2010-01-12 15:15:43 -08:00
Adam Powell
8acdb201bd Added TransformGestureDetector (still in progress)
Modified VelocityTracker to track multiple pointers
Added TransformTest
2010-01-12 15:08:23 -08:00
Irfan Sheriff
cd7703712e Avoid wifi disable in a UNKNOWN state
Multiple broadcast receiver unregister calls cause exception.

Bug: 2361335
2010-01-12 14:53:44 -08:00
Leon Scroggins
2edd68260f Create a new ImeOption that disables fullscreen in landscape, and use it.
EditorInfo:
Add a flag to tell the InputMethodService to never go into fullscreen
mode.

InputMethodService:
When the new flag is set, onEvaluateFullscreenMode always returns
false.

WebTextView:
Use the new flag, along with IME_FLAG_NO_EXTRACT_UI.  Fixes
http://b/issue?id=2358360
2010-01-12 17:29:25 -05:00
San Mehat
22dd86e055 MountService: Refactor to use NativeDaemonConnector and clean-up
Signed-off-by: San Mehat <san@google.com>
2010-01-12 14:12:16 -08:00
San Mehat
67bd2cd75f services: Introduce NativeDaemonConnector class
This class provides an interface to communicate with native daemons using the
libsysutils framework communication code.

Signed-off-by: San Mehat <san@google.com>

NativeDaemonConnector: fix whitespace

Signed-off-by: San Mehat <san@google.com>

NativeDaemonConnector: Fix review comments

Signed-off-by: San Mehat <san@google.com>

NativeDaemonConnector: On an error, re-try the connection

Signed-off-by: San Mehat <san@google.com>
2010-01-12 13:55:39 -08:00
Ken Shirriff
bfd2df21ea Merge "Fix calendar sync_account / type constants to be consistent." 2010-01-12 13:47:07 -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
Jason Sams
ea87e96959 Implement type generation for user uniforms in vertex shader. 2010-01-12 12:12:28 -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
Marco Nelissen
e274db1efd b/2353646
Fix music visualizations to also work with audiotrack callbacks, which
stagefright uses. This slightly changes the way the data is stored,
since before we were relying on the buffers being written always
being at least 4K, whereas the callbacks are generally for smaller
amounts of data. Now we append all the data to a big circular buffer,
then return chunks of that buffer for visualization. When there are
multiple things playing at the same time, this will give the wrong
result, but (1) that was the case before as well, and (2) will be
fixed once we start visualizing the mixer output instead of the
mixer inputs.
2010-01-12 10:27:04 -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
Ken Shirriff
53becd92b5 Fix calendar sync_account / type constants to be consistent.
The EventsEntity names need to match the rest of the Calendar names.
2010-01-11 16:55:17 -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