Jean-Baptiste Queru
c31e9aa9cf
Merge "DRM framwork bug fix: add an API to release resources"
2012-02-29 15:12:48 -08:00
Jean-Baptiste Queru
d02344babf
Merge "Set width of spinner's dropdown to fit on device"
2012-02-29 15:09:17 -08:00
Jean-Baptiste Queru
1f26fe2497
Merge "Adds documentation for ContentResolver notifyChange()"
2012-02-29 14:38:59 -08:00
Jean-Baptiste Queru
35d19b4773
Merge changes I46c81dba,If1f40e9c,I652eaaa5
...
* changes:
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
2012-02-29 14:24:52 -08:00
Jean-Baptiste Queru
f49cfe3daa
Merge "stagefright aacenc: Safeguard against overwriting bits"
2012-02-29 14:23:38 -08:00
Jean-Baptiste Queru
c28371d138
Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
2012-02-28 07:28:52 -08:00
Jean-Baptiste Queru
5d46260664
Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
2012-02-27 16:23:19 -08:00
Jean-Baptiste Queru
47e81bd44d
Merge "Add stubs for better compatibility"
2012-02-27 15:36:22 -08:00
Jean-Baptiste Queru
ccfe22f83d
Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
2012-02-27 12:14:41 -08:00
Jean-Baptiste Queru
64485b7fc7
Merge "stagefright amrwb: Make local const arrays static"
2012-02-27 12:14:02 -08:00
Jean-Baptiste Queru
6a28648990
Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
2012-02-27 12:13:27 -08:00
Jean-Baptiste Queru
c8ebd8e9a8
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
0470e9d4d1
Merge "stagefright aacenc: Simplify the definition of __inline"
2012-02-27 11:11:57 -08:00
Jean-Baptiste Queru
c95d442ac5
Merge "stagefright amrwbenc: Remove a useless check"
2012-02-27 11:11:18 -08:00
Jean-Baptiste Queru
3e9a9416df
Merge "stagefright aacenc: Remove a stray semicolon"
2012-02-27 11:09:59 -08:00
Jean-Baptiste Queru
8f420aeefc
Merge "stagefright amrwb: Make a global const array static"
2012-02-27 11:08:09 -08:00
Jean-Baptiste Queru
d98681e6cc
Merge "stagefright amrwbenc: Change keyword ordering"
2012-02-27 11:06:25 -08:00
Jean-Baptiste Queru
98fc51d885
Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer"
2012-02-27 10:58:51 -08:00
Jean-Baptiste Queru
1f7cd76f0a
Add stubs for better compatibility
...
Change-Id: I3fafee637f3ab239e3b870c73bcfe34cf73caf4c
2012-02-27 08:54:57 -08:00
Jean-Baptiste Queru
9f32cdb3ae
Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
2012-02-24 10:28:01 -08:00
Jean-Baptiste Queru
3815cf38ad
Merge "stagefright aacenc: Fix an inline asm constraint"
2012-02-24 10:22:34 -08:00
Jean-Baptiste Queru
3f10c2513e
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
b36440d1d5
Merge "stagefright aacenc: Zero-initialize a struct"
2012-02-24 09:47:23 -08:00
Jean-Baptiste Queru
69ce038818
Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
2012-02-24 09:20:37 -08:00
Jean-Baptiste Queru
adae87846c
Merge "stagefright aacenc: Add const declarations to some pointers"
2012-02-24 08:53:25 -08:00
Jean-Baptiste Queru
026b1b26e5
Merge "stagefright aacenc: Fix inline asm"
2012-02-24 08:38:23 -08:00
Jean-Baptiste Queru
63f2b75928
Merge "stagefright aacenc: Fix inline asm constraints"
2012-02-24 07:39:03 -08:00
Jean-Baptiste Queru
0025dd37f5
Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
2012-02-23 12:38:14 -08:00
Jean-Baptiste Queru
7cf89f1e78
Merge "Add stubs for improved compatibility"
2012-02-22 12:22:07 -08:00
Jean-Baptiste Queru
7e7e13303d
Merge "Xcode 4.3 compatibility checkin"
2012-02-22 09:54:40 -08:00
Jean-Baptiste Queru
66979ec297
Merge "The bigger touch slop still has a problem"
2012-02-22 09:10:43 -08:00
Jean-Baptiste Queru
24ef414133
Merge "Call onTimeChanged when AM/PM changed."
2012-02-21 07:21:53 -08:00
Al Sutton
579c2b4dc1
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
125c4b9a95
Merge "Return error code when composing PDU fails"
2012-02-17 11:36:52 -08:00
Jean-Baptiste Queru
651fdee192
Merge "Add support for bmp and wav content types in MMS"
2012-02-17 11:03:35 -08:00
Jean-Baptiste Queru
3429dad456
Merge "Increase PDU parts buffer size for performance reasons"
2012-02-17 09:53:29 -08:00
Jean-Baptiste Queru
5e9fd0734f
Merge "Fix incorrect prototype for JNI call"
2012-02-13 14:32:33 -08:00
Jean-Baptiste Queru
6ce7188266
Merge "Skia API changes as a result of an update to the Skia library."
2012-02-06 14:01:06 -08:00
Jean-Baptiste Queru
2bc69de766
Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
2012-01-27 13:36:49 -08:00
Jean-Baptiste Queru
a8ed1d4f9a
Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
2012-01-25 09:17:46 -08:00
Jean-Baptiste Queru
afcc5fa9df
Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
2012-01-24 14:26:32 -08:00
Jean-Baptiste Queru
86391d8791
Merge "stagefright aacenc: Add missing newlines at the end of files"
2012-01-24 10:34:25 -08:00
Jean-Baptiste Queru
e5fb848d1f
Merge "stagefright aacenc: Properly terminate a comment"
2012-01-24 07:51:12 -08:00
Jean-Baptiste Queru
f2e6108eda
Merge "Rename LOG_ASSERT to ALOG_ASSERT"
2012-01-19 14:47:35 -08:00
Jean-Baptiste Queru
82a0641f49
Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
2012-01-19 14:47:22 -08:00
Jean-Baptiste Queru
86c9a50ef8
Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
2012-01-19 14:47:09 -08:00
Jean-Baptiste Queru
837796e964
Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
2012-01-19 14:46:54 -08:00
Jean-Baptiste Queru
04b2818730
Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
2012-01-19 14:46:40 -08:00
Jean-Baptiste Queru
49c36b18b3
Merge "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)"
2012-01-19 14:46:24 -08:00
Steve Block
dcc70319ef
Rename LOG_ASSERT to ALOG_ASSERT
...
Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
2012-01-19 14:45:08 -08:00
