62728 Commits

Author SHA1 Message Date
Kei Takahashi
6225df0103 DRM framwork bug fix: add an API to release resources
When DrmManagerClient object is created and released many times,
the process suddenly crashes.
The case can happen when we make many thumbnails of
DRM-encrypted contents.

The problem is caused by shortage of file descriptors.
DrmManagerClient releases references of file descriptors
only when GC runs. So file descriptors are kept long time
even after the reference of DrmManagerClient are released.

By introducing DrmManagerClient#release() API,
the problem is solved. An application call this API
when we no longer need to use DrmManagerClient object.

Changes are made by SEMC and Sony.

Change-Id: Ie0bbc29cc33872449824285a8d67b1c3cdd8082b
2012-02-29 12:59:53 +09:00
Jean-Baptiste Queru
d7fa7deef9 Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 2012-02-28 07:28:52 -08:00
Jean-Baptiste Queru
f881fa5179 Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" 2012-02-27 16:23:19 -08:00
Jean-Baptiste Queru
93df415c1e Merge "Add stubs for better compatibility" 2012-02-27 15:36:22 -08:00
Jean-Baptiste Queru
9e3d957599 Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" 2012-02-27 12:14:41 -08:00
Jean-Baptiste Queru
354ac772ec Merge "stagefright amrwb: Make local const arrays static" 2012-02-27 12:14:02 -08:00
Jean-Baptiste Queru
695cfe1e1e Merge "stagefright amrwb: Change a C++ style cast into a C style cast" 2012-02-27 12:13:27 -08:00
Martin Storsjo
b084141342 stagefright amr: Avoid C++/C99 for loops with variable declaration
This makes the code compileable in C89 mode, too.

Change-Id: I9b76f8bfca148d1aec6081b8db139f351d64cfed
2012-02-27 21:35:48 +02:00
Jean-Baptiste Queru
f7f1280e0c Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
* changes:
  stagefright amrnb: Remove extern from table definitions
  stagefright amrnb: Add includes for prototype declarations of tables
  stagefright amrnb: Add missing const qualifier to table declarations in headers
2012-02-27 11:16:23 -08:00
Jean-Baptiste Queru
1a864db772 Merge "stagefright aacenc: Simplify the definition of __inline" 2012-02-27 11:11:57 -08:00
Jean-Baptiste Queru
77576ff487 Merge "stagefright amrwbenc: Remove a useless check" 2012-02-27 11:11:18 -08:00
Jean-Baptiste Queru
be9a705586 Merge "stagefright aacenc: Remove a stray semicolon" 2012-02-27 11:09:59 -08:00
Jean-Baptiste Queru
fe5f5d7728 Merge "stagefright amrwb: Make a global const array static" 2012-02-27 11:08:09 -08:00
Jean-Baptiste Queru
94ee1bf232 Merge "stagefright amrwbenc: Change keyword ordering" 2012-02-27 11:06:25 -08:00
Jean-Baptiste Queru
5aff259c61 Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer" 2012-02-27 10:58:51 -08:00
Jean-Baptiste Queru
c3c90353f9 Add stubs for better compatibility
Change-Id: I3fafee637f3ab239e3b870c73bcfe34cf73caf4c
2012-02-27 08:54:57 -08:00
Martin Storsjo
dafebd6bfc stagefright amrnb: Remove extern from table definitions
Local prototype declarations are added where no suitable ones are
available in headers.

This fixes warnings when compiling as C - while the source
files are named .cpp, they actually are compileable as pure C.

This was committed on the master branch of the opencore
repository in commit a0acb494ea6682ca966b5ebbd3676c89c56d63a6,
based on AOSP contribution 10303.

Change-Id: Ib4e27ea30302c66e0233e63e5a4652f6339bc940
2012-02-24 23:07:49 +02:00
Martin Storsjo
9cb864de44 stagefright amrnb: Add includes for prototype declarations of tables
This was committed on the master branch of the opencore
repository in commit da3d0463c999871ee584a0d750be65be65d19b00,
based on AOSP contribution 10302.

Change-Id: I4ad5526634efecc2d2bb3d2169184b8d4d4d7671
2012-02-24 23:07:40 +02:00
Martin Storsjo
67d536a971 stagefright amrnb: Add missing const qualifier to table declarations in headers
This was committed on the master branch of the opencore
repository in commit 5ce7a6fdf125116ffce2e692e14eafef1c807628,
based on AOSP contribution 10301.

Change-Id: Ie32b32c7407f449e382c0b4fd2d60a664e0daa33
2012-02-24 23:07:29 +02:00
Martin Storsjo
7a60831412 stagefright amrwb: Make a global const array static
This fixes compilation as C - while the source files are named
.cpp, they actually are compileable as pure C. Prior to this,
this table produced multiple definitions of the same symbol.

This was committed on the master branch of the opencore
repository in commit a803bd49a631317e0d52ff060cf1799f7741a47e,
based on AOSP contribution 10017.

Change-Id: Id76274964242b119ab61b8181e557477df1e1521
2012-02-24 23:04:24 +02:00
Martin Storsjo
b3094e4a0e stagefright amrwb: Make local const arrays static
Some of these tables exist in both the amrnb and amrwb libraries,
but with different content.

This avoids some cases of multiple definitions of symbols, if
linking in both libraries statically into the same executable,
if the libraries are built as C. (As C++, the local symbols
get mangled so they don't conflict with the external C symbols
in amrnb, that are unmangled.)

Most of this was committed on the master branch of the opencore
repository in commit 0cd4b3ac412dd0a8370ce339e89cf346c6cfe395,
based on AOSP contribution 10016.

Change-Id: I5387e699ce54a56dc43fcfa0396dee5c99280fd9
2012-02-24 23:03:10 +02:00
Martin Storsjo
ab0149852b stagefright amrwb: Change a C++ style cast into a C style cast
This fixes compilation as C - while the source files are named
.cpp, they actually are compileable as pure C (except for this
cast).

This was committed on the master branch of the opencore
repository in commit ae27d9b2ef68c4e6fc383a8cab93d6baa235ff6b,
based on AOSP contribution 10014.

Change-Id: I4f533313be041ad3e0a03ffc5f4207480894ddd1
2012-02-24 23:01:24 +02:00
Martin Storsjo
a9e1747f9e stagefright aacenc: Remove a stray semicolon
This avoids warnings about an empty body in an if statement.

mem_free does the same null check, so the accidental extra
semicolon was harmless, and the whole if statement actually
is needless. But if removing the if statements, all the
other ones should be removed too, for consistency.
(This could be done as a separate change).

Change-Id: I1b6064dedd15ffa949043bb5396148aaed9b43f6
2012-02-24 21:01:26 +02:00
Martin Storsjo
e3c3499468 stagefright aacenc: Add prototypes for arm specific implementations of functions
The arm specific functions are implemented in .s files,
without any function declarations in headers.

This fixes compiler warnings about implicit declarations
of these functions.

Change-Id: I1512560b6740c1879f378886e05aaad2e3a6c869
2012-02-24 20:56:11 +02:00
Martin Storsjo
4a12db6d4e stagefright amrwbenc: Change keyword ordering
This avoids warnings about 'static' not being at the beginning
of the declarations.

Change-Id: I80f91b8a0f7f61edcdca96c206fedbd74ec0d88e
2012-02-24 20:54:26 +02:00
Martin Storsjo
30b0bb41f5 stagefright amrwbenc: Remove a useless check
Since the Length field is unsigned, the comparison will always
be false. The corresponding code in the aac encoder doesn't have
any check for Length.

This avoids a warning about comparison always being false.

Change-Id: I57c28ff9d09cb9ac4effeaeb40db608ab976acc6
2012-02-24 20:54:14 +02:00
Jean-Baptiste Queru
6a300a5413 Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 2012-02-24 10:28:01 -08:00
Jean-Baptiste Queru
d6a25154d9 Merge "stagefright aacenc: Fix an inline asm constraint" 2012-02-24 10:22:34 -08:00
Jean-Baptiste Queru
ea22778725 Merge changes I903353c5,I822dcc74
* changes:
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
2012-02-24 10:07:49 -08:00
Jean-Baptiste Queru
bf45bbf3b4 Merge "stagefright aacenc: Zero-initialize a struct" 2012-02-24 09:47:23 -08:00
Jean-Baptiste Queru
e5bdd24b69 Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" 2012-02-24 09:20:37 -08:00
Jean-Baptiste Queru
47b56c5a46 Merge "stagefright aacenc: Add const declarations to some pointers" 2012-02-24 08:53:25 -08:00
Jean-Baptiste Queru
1b7046108c Merge "stagefright aacenc: Fix inline asm" 2012-02-24 08:38:23 -08:00
Jean-Baptiste Queru
bf1e85bfc8 Merge "stagefright aacenc: Fix inline asm constraints" 2012-02-24 07:39:03 -08:00
Jean-Baptiste Queru
63e43ba56a Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 2012-02-23 12:38:14 -08:00
Jean-Baptiste Queru
69e9c30c26 Merge "Add stubs for improved compatibility" 2012-02-22 12:22:07 -08:00
Jean-Baptiste Queru
2d03a93ecf Merge "Xcode 4.3 compatibility checkin" 2012-02-22 09:54:40 -08:00
Jean-Baptiste Queru
4280891dbc Merge "The bigger touch slop still has a problem" 2012-02-22 09:10:43 -08:00
Jean-Baptiste Queru
cd0f3088ef Add stubs for improved compatibility
Change-Id: I77b348b4c592e0b694aabb069812c94b9cb79a00
2012-02-21 13:49:15 -08:00
Jean-Baptiste Queru
fc24982a44 Merge "Call onTimeChanged when AM/PM changed." 2012-02-21 07:21:53 -08:00
Masanori Ogino
dac640f403 The bigger touch slop still has a problem
I had submitted the patch about this issue at
https://android-review.googlesource.com/#/c/20438/ before. But it
has never been included in any version.

In the latest implementation, touchSlop is a configurable value
which is declared in config.xml for each device. First of all,
the problem is that BiggerTouchSlop is not scalable and variable
value according to a configured touchSlop.

I don't think that there should be a new api in ViewConfiguration
for this. Because the bigger touch slop is a local threshold value
in GestureDetector. The only thing to be satisfied is that the
value should be bigger than configured touch slop and should not
be over double touch slop.

Change-Id: I2c6662400fcffb4a7192ede4ac8da08559aa7948
2012-02-20 15:51:17 +09:00
Al Sutton
7a4d92af9b Xcode 4.3 compatibility checkin
The update compiler in Xcode 4.3 (and 4.4) requires lookups into dependant
bases of class templates to be qualified. This checkin fixes the issues
raised by the compiler by implementing the this-> recommendation from
the llvm page at http://clang.llvm.org/compatibility.html#dep_lookup_bases

Signed-off-by: Al Sutton <al@funkyandroid.com>
2012-02-19 08:31:19 +00:00
Jean-Baptiste Queru
44c1f012c4 Merge "Return error code when composing PDU fails" 2012-02-17 11:36:52 -08:00
Jean-Baptiste Queru
c2461eb32e Merge "Add support for bmp and wav content types in MMS" 2012-02-17 11:03:35 -08:00
Jean-Baptiste Queru
a1ee18f141 Merge "Increase PDU parts buffer size for performance reasons" 2012-02-17 09:53:29 -08:00
Matthias Thomae
9962ca12fb Increase PDU parts buffer size for performance reasons
Changed the size of the temporary buffer used when storing a PDU part
to 8192 bytes instead of the previous 256 bytes. This greatly
decreases the time needed to store relatively large PDU parts. The
times to store PDU parts were so long that we frequently ended up with
an ANR. This change resulted in a total time usage of ~1000 ms instead
of ~10000 ms for ~500 kB worth of data.

Change-Id: Ia02cb28e4fd9dfe3aaa1fa30ff37659951cbed93
2012-02-17 11:56:27 +01:00
Matthias Thomae
54c3ce2f14 Return error code when composing PDU fails
When the PduComposer fails to make the message body,
a successful result code was still returned.

Change-Id: I8a677afeeae8811c3b0fae61209c5348df1e39d9
2012-02-16 11:17:39 +01:00
SeongJae Park
f821ce7522 Call onTimeChanged when AM/PM changed.
Commit for issue http://code.google.com/p/android/issues/detail?id=24388

[Problem]
TimePicker doesn't call handler's onTimeChanged when AM/PM changed on
ICS althou it does on Gingerbread.

[Solution]
Call onTimeChanged as like as Hour/Minutes does.

Change-Id: I9911c351874168001b69c186f012836fc51285f5
Signed-off-by: SeongJae Park <sj38.park@gmail.com>
2012-02-14 08:40:13 -08:00
Jean-Baptiste Queru
472512f697 Merge "Fix incorrect prototype for JNI call" 2012-02-13 14:32:33 -08:00
Jean-Baptiste Queru
a081c7b8bc Merge "Skia API changes as a result of an update to the Skia library." 2012-02-06 14:01:06 -08:00