16988 Commits

Author SHA1 Message Date
Bjorn Bringert
80d3091b99 Merge "Remove Intent.ACTION_GLOBAL_SEARCH" 2010-01-14 02:26:50 -08:00
Bjorn Bringert
7f6528113c Merge "Add QSB's GoogleSearch as the preferred web search provider" 2010-01-14 02:25:34 -08:00
Jason Sams
22550a1943 Merge "Remove excessive logging, fix error in GLSL uniform generation." 2010-01-13 14:54:20 -08:00
Jason Sams
e17e365b71 Remove excessive logging, fix error in GLSL uniform generation. 2010-01-13 14:52:46 -08:00
Dan Egnor
52952b1bca Overhaul of dumpstate (aka bugreport) with cleanups & enhancements:
- include basic build & timestamp information in the header
- collect stack traces immediately at bugreport time
- *also* show stack traces from last ANR (as before), if in the last 15 minutes
- alphabetize system properties dump
- remove now-obsolete (and always questionable) "dumpcrash" functionality
- write to a .tmp file first, then rename to the final filename
- friendly usage message
- output sections include the exact file/command run
- source de-weirdification -- it's several hundred lines shorter now

The same data is present in the same order as before, and I've tried
to preserve all the grep/search targets people might use to find their
way through the file.
2010-01-13 14:30:33 -08:00
Neal Nguyen
96e40b4b37 Merge "Framework Tests Cleanup: Removing CTS duplicate files" 2010-01-13 14:19:11 -08:00
Neal Nguyen
8d1966eac0 Merge "Framework Tests Cleanup: Removing CTS duplicate files" 2010-01-13 14:18:48 -08:00
Neal Nguyen
83fe5de254 Merge "Framework Tests Cleanup: Removing CTS duplicate files" 2010-01-13 14:18:17 -08:00
Neal Nguyen
ae51f0a857 Merge "Framework Tests Cleanup: Removing CTS duplicate files" 2010-01-13 14:17:56 -08:00
Bjorn Bringert
a94e7afb28 Remove Intent.ACTION_GLOBAL_SEARCH
I added Intent.ACTION_GLOBAL_SEARCH a little while ago, since
I thought we needed it to be different from the old
SearchManager.INTENT_ACTION_GLOBAL_SEARCH. Since GlobalSearch is
no longer built, reusing SearchManager.INTENT_ACTION_GLOBAL_SEARCH
should be fine.

Change-Id: If3a11a77a8e1d9940cf2b20817a60888cdd9d69f
2010-01-13 21:09:20 +00:00
John Wang
f6f56c051c Merge "Hangup calls before powering off radio." 2010-01-13 12:12:49 -08:00
Patrick Scott
139f6f31d1 am 70c4f6cf: am 021b7b44: Add a static method to obtain the mime type from extension.
Merge commit '70c4f6cfb4fd48d5153080d038ac0f5b6dbd98ec'

* commit '70c4f6cfb4fd48d5153080d038ac0f5b6dbd98ec':
  Add a static method to obtain the mime type from extension.
2010-01-13 11:51:33 -08:00
Robert Greenwalt
1bc3c3775b Fix Javadoc errors so the sdk can build.
I unhid some API in a previous install, triggering javadoc processing on
their buggy comments.

Fixing build.
2010-01-13 11:47:50 -08:00
Patrick Scott
70c4f6cfb4 am 021b7b44: Add a static method to obtain the mime type from extension.
Merge commit '021b7b443fa4bb24ec73d0c09cf019c14eba67bc' into eclair-mr2-plus-aosp

* commit '021b7b443fa4bb24ec73d0c09cf019c14eba67bc':
  Add a static method to obtain the mime type from extension.
2010-01-13 11:37:33 -08:00
Andreas Huber
5a2ade33fa Merge "More metadata support." 2010-01-13 11:28:21 -08:00
Patrick Scott
021b7b443f Add a static method to obtain the mime type from extension.
This method is used by WebKit to obtain the mime type from an extension.

Bug: 2368893
2010-01-13 14:12:43 -05:00
Andreas Huber
3a3656ce8a More metadata support. 2010-01-13 10:45:49 -08:00
Robert Greenwalt
c849cdf5cf Unhide some CM constants to support unbundling.
The MOBILE_MMS, MOBILE_SUPL, MOBILE_DUN and MOBILE_HIPRI net types used
by location, messaging, and vending needed to be exposed.

Bug: 2363272
Change-ID: I6d2361d3642064db619b283b9217512563eb3439
2010-01-13 10:01:44 -08:00
Leon Scroggins
a77f93f76a am ace8addc: am 2edd6826: Create a new ImeOption that disables fullscreen in landscape, and use it.
Merge commit 'ace8addce47efc03be5038eef48d7fb066b14aae'

* commit 'ace8addce47efc03be5038eef48d7fb066b14aae':
  Create a new ImeOption that disables fullscreen in landscape, and use it.
2010-01-13 06:15:38 -08:00
Leon Scroggins
ace8addce4 am 2edd6826: Create a new ImeOption that disables fullscreen in landscape, and use it.
Merge commit '2edd68260f26cbd6eddd0df16404bb6bcb22b3b6' into eclair-mr2-plus-aosp

* commit '2edd68260f26cbd6eddd0df16404bb6bcb22b3b6':
  Create a new ImeOption that disables fullscreen in landscape, and use it.
2010-01-13 06:11:05 -08:00
Bjorn Bringert
4a5bff9e27 Add QSB's GoogleSearch as the preferred web search provider
This is temporary, until we can switch to using the GLOBAL_SEARCH
permission to decide who is the web search provider.

Change-Id: I6491671e33ab05297d05114968d8b7f492a2b6d4
2010-01-13 10:56:55 +00:00
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