22287 Commits

Author SHA1 Message Date
Gloria Wang
d93349342a Merge "Update of DRM Framework." 2010-11-22 21:14:09 -08:00
Jean-Baptiste Queru
e4ae7fc3eb Merge "Enabling cell broadcast (SMS-CB) support in the platform." 2010-11-22 15:59:04 -08:00
Jean-Baptiste Queru
b2b0db2d5c Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser" 2010-11-22 13:40:29 -08:00
Deepika Sai Amuri
b00d41acd6 SearchDialog: Fix for NullpointerException while using Suggestions in
Browser

Change-Id: Ic208ae51e4f7678363ea6d7de9db97707713bf6d
2010-11-22 01:31:35 -08:00
Jean-Baptiste Queru
e2ec61b23b Merge "StagefrightMediaScanner: Call endFile() for MIDI and OGG files." 2010-11-19 15:50:29 -08:00
Jean-Baptiste Queru
e3bef7c48d Merge "Added noop unregisterReceiver to complement existing noop registerReceiver." 2010-11-19 15:31:30 -08:00
Brad Fitzpatrick
251384a759 Merge "Improve performance when getting styled string." 2010-11-19 07:41:39 -08:00
Henrik Hall
95bc625e29 Enabling cell broadcast (SMS-CB) support in the platform.
Adding a simple API enabling applications to control SMS-CB reception.
Implementing parsing, assembly and dispatching of SMS-CB messages over GSM.

Change-Id: Iee841605a45a3af60c7602af175056afb03a38da
2010-11-19 15:00:00 +01:00
Takeshi Aimi
dc91865622 Update of DRM Framework.
-Access permission handling
  Introduce an internal function which allows the desired process to
  access decryption flow. This new function is just for reference and
  each OEM manufacturer should implement/replace with their solutions.
-New API, getMetadata()
  This API is for retrieving media metadata from container-based DRM,
  such as OMA forward-lock content. This API asks DRM agent to retrieve
  media metadata hiddein inside of DRM special container.
-New API, acquireRights()
  This API wraps acquireDrmInfo() and processDrmInfo().
  If DRM agent has valid implementation of both APIs,
  Application can acquire DrmRights only by calling this API.
-Bug fix in event loop of OnInfoListener.
  Separate OnInfo event loop from mail thread loop so as to avoid
  the issue that message is not dispatched when mail thread is busy.

Changes are made by SEMC and Sony.

Change-Id: I04ee3e0988152a71e221f2256d83253749a29da0
2010-11-19 22:02:51 +09:00
Hiroshi Takekawa
dc1a26eb78 StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
addStringTag() caches non-ascii metadata strings for later
processing, and then endFile() will be called at the end of
processFile() to convert non-ascii strings from locale's charset
to utf-8 if required.

Stagefright's processFile() failed to call endFile() when the
processing file is a MIDI file or an OGG file.  This patch fixes
this problem to populate metadata correctly.

Reviewed by: Brad Fitzpatrick, Marco Nelissen.

Change-Id: I072e79d81dce1fec63297d2b5d2b870a72e5b66e
2010-11-19 12:14:37 +09:00
Peter Eliasson
ac4a181d2e Improve performance when getting styled string.
The style used in the composing text for input methods
takes a long time to create. This is experienced as a
lag when composing the first word.

The bottleneck lies in the 10 calls to
nativeIndexOfString which does a linear search through
thousands of strings.

Change-Id: I3184b2be3673d384cca19e9a70ad94b4d3085576
2010-11-18 07:28:06 +01:00
Jean-Baptiste Queru
14ac954636 Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*" 2010-11-17 18:40:31 -08:00
Jean-Baptiste Queru
27c06bab51 Merge "Release reference when putting RILRequest back into the pool." 2010-11-17 17:58:14 -08:00
Jean-Baptiste Queru
d34c149502 Merge "Prevent system crash when OOM in Binder thread." 2010-11-17 17:49:19 -08:00
Jean-Baptiste Queru
11dba787e1 Merge "Fix build (broken documentation link)" 2010-11-17 17:41:22 -08:00
Jean-Baptiste Queru
2f0a3307fd Fix build (broken documentation link)
Change-Id: Ic36f81bbd9f112bd79f9177a407593e8c8f7f0ed
2010-11-17 17:39:16 -08:00
Jean-Baptiste Queru
a15e4886de Merge "Framebuffer: Support variable number of framebuffers in the UI" 2010-11-17 17:15:42 -08:00
Jean-Baptiste Queru
09e50cdbc6 Merge "Reorder lock acquision vs try." 2010-11-17 17:03:10 -08:00
Matthias Bady
b61d530575 build failed with g++ v. 4.4.5
err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’
strrchr provides two prototypes. the one used returns const char* instead of char*

Change-Id: I6442ee642aebfbfc2f977bab40016cfedc7789ac
2010-11-18 00:22:48 +01:00
Jean-Baptiste Queru
8fc378f9f5 Merge "Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter." 2010-11-17 15:10:05 -08:00
Brad Fitzpatrick
383e95e245 Merge "DropBox: Read until the end of stream has been reached" 2010-11-16 09:22:31 -08:00
Christian Lindeberg
e9f1881521 DropBox: Read until the end of stream has been reached
Read the requested length or until the end of the input stream
has actually been reached.

Change-Id: I01bc0b81eca0225209bdd288dde6a778a19d1e2c
2010-11-16 09:57:54 +01:00
Jonas Schwertfeger
8402903723 Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter.
The signatures of the existing buildQuery and buildUnionSubQuery methods include a selectionArgs
parameter that is not actually being used in the method implementations.  This parameter leads
to the misconception that SQL paramter substitution is carried out by these methods.  I added
new variants of these methods without that parameter and deprecated the old variants.

Change-Id: I1bf770d5c777649e9aac36d93aa93bd65bbcc2a3
2010-11-12 12:18:37 +01:00
Amith Yamasani
db65907a21 Merge "Adding pan behavior on preference dialog." 2010-11-11 08:50:52 -08:00
Brad Fitzpatrick
9de93424cc Merge "Without SD card the shutdown sequence was delayed" 2010-11-10 10:58:50 -08:00
Johan Alfven
5d0db4d356 Without SD card the shutdown sequence was delayed
If the memory card is not inserted (or removed) from
the phone the shut down process is very long. It
takes almost 24 seconds. For the phone with memory
card the averige is 5-6 seconds

Make sure to send onShutDownComplete even if an SD
card is not mounted and no unmount is done.

Change-Id: I0e79b82e294a971f5e7144cdd3cc16b7ff414b9c
2010-11-09 10:32:25 +01:00
Mattias Petersson
19f22745aa Prevent system crash when OOM in Binder thread.
When handling large images during an update of a widget,
we can run out of memory in the Binder thread. This will
cause an OutOfMemoryError to be thrown. When an Error is
thrown in the Binder thread, the entire system will crash.
This was fixed by catching this OutOfMemoryError and instead
throw a RuntimeException to keep the system alive.

Change-Id: If27199676c6f8aef23fb249be1197ca5dfe0fe99
2010-11-05 08:27:14 +01:00
Jean-Baptiste Queru
5580e44c25 Merge "Support changing style parent in overlays" 2010-11-04 07:26:37 -07:00
Rodrigo Obregon
84043438cf Framebuffer: Support variable number of framebuffers in the UI
This change defines a macro NUM_FRAME_BUFFERS to set
the desired number of framebuffers to be used by the UI,
instead of hard-coding 2 framebuffers.

Aditional logic has been  added to handle the initialization
and destruction of NUM_FRAME_BUFFERS buffers.

Change-Id: I3a4bfec3e0f453432f2ffebf084c00f574d3be46
Signed-off-by: Rodrigo Obregon <robregon@ti.com>
2010-11-03 15:16:18 -05:00
Brad Fitzpatrick
db2403ff32 Merge "Add support for UAProf header in HTTP requests" 2010-11-03 11:38:06 -07:00
Jean-Baptiste Queru
42c94791b0 Merge "Fix the animation disappeared issue" 2010-11-03 10:16:30 -07:00
Chih-Wei Huang
2978751310 Fix the animation disappeared issue
The animation movie disappears due to the incorrect logic of
commit c11f46259a1e8f4e7e58925aefd1ed9eaf57a7fc.

Change-Id: I9c0eac2bf2950fe20e931da367036ddf38d81f52
2010-11-03 15:33:00 +08:00
Brad Fitzpatrick
9df48a0305 Merge "NotificationManager: droiddoc documentation improvements" 2010-11-02 14:55:21 -07:00
Gloria Wang
ef8a810b3b Merge "Update of DRM framework" 2010-11-02 14:45:02 -07:00
Jean-Baptiste Queru
bbd212d778 Merge "Document per-implementation behaviors of native get* methods" 2010-11-02 13:27:36 -07:00
Jean-Baptiste Queru
715f861077 Merge "Clarify documentation of Cursor get* methods." 2010-11-02 13:11:56 -07:00
Daniel Trebbien
adf4194458 Document per-implementation behaviors of native get* methods
Change-Id: I5d20d7796b85ce62750dd50dd79e47d76716b24c
2010-11-02 09:35:12 -07:00
Daniel Trebbien
65068b099e Clarify documentation of Cursor get* methods.
Make clear in the Javadoc comments of the `Cursor` get* methods that
implementations thereof can have implementation-defined behavior. In some cases,
these changes actually correct the documentation. For example, in the case of
`getShort` and the `SQLiteCursor` implementation thereof, non-numeric data is
*not* converted to a `short` via Short#valueOf or even in a functionally-
equivalent manner.

Change-Id: Ib2f81811a603680b52fc482eb9c0f3195447566f
2010-11-02 09:24:07 -07:00
Matthias Thomae
bdb0896ba5 Add support for UAProf header in HTTP requests
Each HTTP request sent from a mobile handset is usually required to
include a x-wap-profile header following the UAProf specification. The
value of this header is a URL that points to the location of a
document which specifies relevant capabilities of the phone, e.g.
supported network bearers, video formats or screen size. This change
defines a global string resource that holds this URL, and also adds
the necessary code in the web widget to include this header in HTTP
requests.
2010-11-02 13:26:24 +01:00
Gloria Wang
c1c45a4dc9 Merge "- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled." 2010-11-01 20:38:51 -07:00
Gloria Wang
eab18ea34d - Move the business rule management down to DRM agents.
- Do not register DRM sniffer because drmserver is not enabled.

Change-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f
2010-11-01 16:12:16 -07:00
Takeshi Aimi
c7b3ccc564 Update of DRM framework
- Overload openDecryptSession() with uri parameter
   in order to accept URI of DRM content,
   Following API is added,
       DecryptHandle*openDecryptSession(const char* uri);.
 - Unify texisting three event types of processDrmInfo()
   so that caller of DRM framework does not have to handle many event types.
 - Let DrmManagerService call load/unload plugins API so that
   client of DRM framework does not have to manage plug-in load/unload.
 - Trivial fix in DrmManagerClient.java is also incorporated.

Changes are made by Sony Corporation.

Change-Id: If62b47fa0360718fdc943e6e6143671d7db26adc
2010-11-02 08:06:06 +09:00
Daniel Trebbien
38767b34ba Reorder lock acquision vs try.
In two places involving locking, reordered the code so that the lock
acquisition is performed outside of the `try` block and everything
else that needs to run while the lock is locked *within* the `try`
block.

Change-Id: I3dad2c4bbf60b219fc6db2aa35e2ed296cb39128
2010-11-01 14:13:56 -07:00
Jean-Baptiste Queru
5b4d0e84d3 Merge "TabWidget orientation" 2010-11-01 13:19:02 -07:00
Jean-Baptiste Queru
b6db2d5125 Merge "Bluetooth OBEX timeout problem." 2010-11-01 10:46:36 -07:00
Jean-Baptiste Queru
b1fa549a49 Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)." 2010-11-01 10:29:22 -07:00
Romain Guy
cee8d1d345 Merge "fix typo" 2010-10-31 11:12:51 -07:00
Daniel Trebbien
0a675fd8fe Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907).
The Javadoc comment for class `android.content.UriMatcher` had four issues:
1. The example calls to `addURI` should not be using a leading forward slash in
   the path parameter (reported by Ester Ytterbrink).
2. The sample code to construct a `UriMatcher` was incorrect because the
   `UriMatcher` constructor takes a parameter (reported by Ross Light).
3. The code example for using `match` was incorrect because it showed two
   parameters being passed, when `match` only takes one (reported by
   Ross Light).
4. The sample `getType` implementations were incorrect because `getType` takes
   a `Uri` object, not an array of `String`s.

Change-Id: I560bff6f021c13cabf736f40ff0f47a205074291
2010-10-31 07:42:35 -07:00
Uwe Voelker
fc8daba45e fix typo
Change-Id: Ib36aabc68128d1b2b8c41b965a10be2ab2f4cd93
2010-10-31 10:08:04 +01:00
Anders Petersson
faf49b14a2 Bluetooth OBEX timeout problem.
Long time to show notification of file transfer failed after
canceling transfer via remote part.

Device A is in contact with our device, B. When device A Cancel
a transfer operation, it sends OBEX_OPCODE_DISCONNECT HeaderID
and the length of package to B. B use the length of package to
read remainder bytes from A. If the bytes B read do not meet the
received length it will block and wait for remainder bytes from A.
But when B compute the remainder bytes it forgets to subtract
the three bytes it has already read through HeaderID and the length
of the package. So the operation was blocked until the operation
timeout.

Change-Id: I0f8bf62d3119e081b5c01af9fc05fe586fd4fabc
2010-10-27 08:38:30 +02:00