drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,674 Commits 1 Branch 0 Tags
Commit Graph

62674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Storsjo
27bd8da964 stagefright aacenc: Avoid overflows when calculating normFactor 
normFactor is calculated using the saturating L_add function,
but if the value added (*psfbPeFactors) is negative, the sum
can end up negative.

*psfbPeFactors can end up negative if redThrExp is less than
*psfbNActiveLines.

In cases where *psfbPeFactors ended up negative, normFactor
became INT_MIN, causing division by zero later.

Change-Id: I00c852e457b22f7eef4d6ed1887629828057206b
 2012-02-19 21:47:54 +02:00
Martin Storsjo
23d3628628 stagefright aacenc: Avoid a division by zero 
In rare cases, the result of normFactor * (*psfbNActiveLines)
could be zero, leading to a division by zero in pow2_xy.

In these cases, normFactor was INT_MIN, and if *psfbNActiveLines
was 2, the product was zero.

normFactor being INT_MIN is a bug in itself though.

Change-Id: Ib31bf02889615a7be3bd1bc028da8a7651a8dbee
 2012-02-19 21:47:50 +02: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
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
Bhanu Chetlapalli
8835f2928e Fix incorrect prototype for JNI call 
This issue caused every Application launch to crash when using
portable JIT

Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com>

Change-Id: Id7cfdeb4fc00ba4b1ca6fa24bc01c8f3432857ff
 2012-01-31 12:44:04 -08:00
Derek Sollenberger
889a3fa6ab Skia API changes as a result of an update to the Skia library. 
These changes are required to work with r3022 of Skia

Change-Id: Ib7cebeb2eba6790bb38edfc2397b311cf419e17c
 2012-01-31 14:08:22 -05:00
Jean-Baptiste Queru
9781870491 Merge "Wi-Fi: Handle disconnect in middle of DHCP operation" 2012-01-27 13:36:49 -08:00
Vishal Mahaveer
21bd79f51c Wi-Fi: Handle disconnect in middle of DHCP operation 
Restore power mode and BT co-ex settings when disconnect
happens in middle of DHCP operation.

Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
 2012-01-27 14:51:23 -06:00
Jean-Baptiste Queru
12045502c4 Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" 2012-01-25 09:17:46 -08:00
Jean-Baptiste Queru
98539a4eba Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" 2012-01-24 14:26:32 -08:00
Jean-Baptiste Queru
d80cbb8c7b Merge "stagefright aacenc: Add missing newlines at the end of files" 2012-01-24 10:34:25 -08:00
Jean-Baptiste Queru
164a984224 Merge "stagefright aacenc: Properly terminate a comment" 2012-01-24 07:51:12 -08:00
Jean-Baptiste Queru
9d25b82d28 Merge "Rename LOG_ASSERT to ALOG_ASSERT" 2012-01-19 14:47:35 -08:00
Jean-Baptiste Queru
6df477be18 Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 2012-01-19 14:47:22 -08:00
Jean-Baptiste Queru
a826f9e2c4 Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 2012-01-19 14:47:09 -08:00
Jean-Baptiste Queru
4f367f3387 Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 2012-01-19 14:46:54 -08:00
Jean-Baptiste Queru
ba7f0d2a03 Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 2012-01-19 14:46:40 -08:00
Jean-Baptiste Queru
ee4618bc4d Merge "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)" 2012-01-19 14:46:24 -08:00
Steve Block
f68633da3c Rename LOG_ASSERT to ALOG_ASSERT 
Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
 2012-01-19 14:45:08 -08:00
Steve Block
c6aacce371 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) 
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
 2012-01-19 14:45:03 -08:00
Steve Block
a51f0e707f Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) 
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
 2012-01-19 14:44:59 -08:00
Steve Block
933e856150 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) 
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
 2012-01-19 14:44:56 -08:00
Steve Block
1afd5bab4e Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) 
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
 2012-01-19 14:44:50 -08:00
Steve Block
06ade6ae1b Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) 
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
 2012-01-19 14:44:31 -08:00
Jean-Baptiste Queru
c318bbb05e Merge "Rename (IF_)LOG() to (IF_)ALOG()" 2012-01-19 14:41:57 -08:00
Steve Block
ad3f5145fe Rename (IF_)LOG() to (IF_)ALOG() 
Change-Id: If49c81a2793182771c6160fbca93905daa6f44c1
 2012-01-18 11:08:20 +00:00
Martin Storsjo
d7bbc3d41a stagefright aacenc: Properly terminate a comment 
This avoids a warning about /* within a comment.

Change-Id: I9079909734d35db5ab0fd54b46173d7a1848d0c9
 2012-01-13 21:21:51 +02:00
Martin Storsjo
75261fa150 stagefright aacenc: Fix type definitions for 64 bit platforms 
Also don't require LINUX to be defined, enable the MSVC typedefs
only within _MSC_VER.

This fixes a lot of warnings about dereferencing pointer 'winPtr'
breaking strict aliasing rules.

Change-Id: I4afbe0ed81295ebe6e5ee2c7f0fb0cc2dc83c89b
 2012-01-13 21:05:56 +02:00
Martin Storsjo
656bb978b3 stagefright amrwbenc: Make the mem_malloc function 64-bit safe 
Change-Id: Iab0dbfdc6be09c62d353bee46596635686b784a6
 2012-01-13 20:57:09 +02:00
Martin Storsjo
17510c1b4e stagefright aacenc: Add missing newlines at the end of files 
This avoids compiler warnings about missing newlines.

Change-Id: Ieb2bb7152d794dca47c629588879032d3ba65677
 2012-01-13 20:56:42 +02:00
Jean-Baptiste Queru
b4cee0f871 Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 2012-01-13 07:48:56 -08:00
Mans Rullgard
62a62ef415 stagefright aacenc/amrwbenc: Remove trailing whitespace 
This was applied in AOSP master earlier, in commit
b21611e5b0f1797e39e781d91ade023bac87637f, but when merged
into the Google internal tree in
88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these
changes have been brought in. (The diff of this merge commit
and its first parent, d94b71d, is empty.)

Therefore, reapply the rest of these changes on the files
that still are present in the current version.

Change-Id: I645a9b9134769958a11808a06163123d28d83e46
 2012-01-12 11:14:04 +02:00
John Reck
0a3fcc3eed Fix Apache stack 
Change-Id: Iec7d0d8bdaaa5594fa7412db79943ab0ccdf594c
 2012-01-11 13:35:29 -08:00
The Android Open Source Project
57ea96a4b3 Reconcile with ics-mr1-release 
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
 2011-12-16 08:08:07 -08:00
Dirk Dougherty
4365a48612 am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview. 
* commit '8b6ed2d17d5e7e47944026679c9cba66611ab27f':
  Doc change: edits to ICS MR1 API Overview.
 2011-12-16 00:25:06 -08:00
Dirk Dougherty
8b6ed2d17d Doc change: edits to ICS MR1 API Overview. 
Change-Id: Idb18e3085b3dd54c9a39e74c37428c3d5b28aa83
 2011-12-16 00:11:43 -08:00
Joe Fernandez
9b06f091c4 am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '5b18c714bbff269d7db880b42de34fd1385da9f9':
  docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 23:12:57 -08:00
Joe Fernandez
5b18c714bb Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 23:11:26 -08:00
Joe Fernandez
71d5c1db17 docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6 
Change-Id: I628cd076cd37f6252837de276c4b7a9040c37bc1
 2011-12-15 23:09:43 -08:00
Fred Chung
d30167f0cd am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit '14633f1b1eea585cdc094ebae75708db2293fe56':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:35:10 -08:00
Fred Chung
14633f1b1e am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit '48e0617b9e7d06da803c572d6584d68898733d37':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:33:31 -08:00
Fred Chung
48e0617b9e Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
Change-Id: Ide393a0957f3e797f14d7c349c35337849b15f02
 2011-12-15 22:25:19 -08:00
Scott Main
ed8851a6f2 am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '8e980c1e4e86cb4c7ea679eba3cc01d64e323b26':
  docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 22:14:48 -08:00
Scott Main
8e980c1e4e Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 22:12:53 -08:00
Scott Main
4faca92faa am 36c67785: docs: update homepage for 4.0.3 announcment 
* commit '36c677855c0a54ede9e92aa856cb2250960e922e':
  docs: update homepage for 4.0.3 announcment
 2011-12-15 22:09:46 -08:00