summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 33029221: Merge "revert the surface purgatory list and dependent ↵Mathias Agopian2011-03-098-88/+19
|\ | | | | | | | | | | | | changes." into gingerbread * commit '33029221619f14577bd0d0e7c2f815abc8f1b8ea': revert the surface purgatory list and dependent changes.
| * Merge "revert the surface purgatory list and dependent changes." into ↵Mathias Agopian2011-03-098-88/+19
| |\ | | | | | | | | | gingerbread
| | * revert the surface purgatory list and dependent changes.Mathias Agopian2011-03-098-88/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d0f6cb Revert "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" 6154412 Revert "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" 37c2a37 fix [3408713] Dialog window invisible sometimes It looks like there is a surface leak, it's unclear where it is. Without those reverts, this would cause a leak of the associated buffers which is far more problematic. this change might hide the surface leak. Bug: 4078032 Change-Id: Iedcda3ffcdd2f69d41047b5c3134c1e867ff90d7
* | | am b710a50a: Merge "fix [3452750] Issue 14634: ↵Mathias Agopian2011-03-091-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread * commit 'b710a50ab6ca36b502f548e8551f620e98bbb1d8': fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]
| * | Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector ↵Mathias Agopian2011-03-091-1/+2
| |\ \ | | | | | | | | | | | | gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
| | * | fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets ↵Mathias Agopian2011-03-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NaN-Values [external] [DO NOT MERGE] make sure to not pass negative numbers to sqrt(). Change-Id: Ia31f7ebb7b75c79b548e428c6084fa55031617d0 related-bug: 3452750
* | | | am c05d35db: Merge "fix [4026375] SensorManager quaternion functions can ↵Mathias Agopian2011-03-091-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | call sqrt with a negative number [DO NOT MERGE]" into gingerbread * commit 'c05d35db1c57de97888f16ed74718e4c676e4a9b': fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]
| * | | Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a ↵Mathias Agopian2011-03-091-2/+2
| |\ \ \ | | |/ / | | | / | | |/ | |/| negative number [DO NOT MERGE]" into gingerbread
| | * fix [4026375] SensorManager quaternion functions can call sqrt with a ↵Mathias Agopian2011-03-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | negative number [DO NOT MERGE] Just make sure to clamp the argument to zero. Bug: 4026375 Change-Id: Idd3d4ef977e87c1b3f6b54371105c3152d7dc6b9
* | | am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-091-14/+24
|\ \ \ | |/ / | | | | | | | | | * commit 'bd0e806a61df9b67890dc3b1390db554e7468b4a': Support IPv6->IPv4 fallback in HTTP streaming.
| * | Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-081-14/+24
| | | | | | | | | | | | | | | Bug: 4068057 Change-Id: I425f65a99eb9e0986d9e9c0e264c3c8f61fcfdbd
* | | am b9da16a1: Support IPv6 in HTTP streaming.Lorenzo Colitti2011-03-091-9/+17
|\ \ \ | |/ / | | | | | | | | | * commit 'b9da16a1e36fcf4e38a50adcf10ea59c12dea254': Support IPv6 in HTTP streaming.
| * | Support IPv6 in HTTP streaming.Lorenzo Colitti2011-03-081-9/+17
| | | | | | | | | | | | | | | Bug: 4068057 Change-Id: I1e141ec99fbfa43722eeb2e4161d56548ffc0640
* | | am df6410dc: Merge "Fix [3513017] in lockscreen but showing empty launcher ↵Mathias Agopian2011-03-077-31/+76
|\ \ \ | |/ / | | | | | | | | | | | | | | | (live wallpaper) only" into gingerbread * commit 'df6410dce3dae0bdb7e13118b3878079a1dcce03': Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only
| * | Merge "Fix [3513017] in lockscreen but showing empty launcher (live ↵Mathias Agopian2011-03-077-31/+76
| |\ \ | | | | | | | | | | | | wallpaper) only" into gingerbread
| | * | Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) onlyMathias Agopian2011-03-077-31/+76
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37c2a37 fix [3408713] Dialog window invisible sometimes d35c666 fix [3385504] Surface flinger hang when adding dim surface 1723b04 fix [3389263] OMX.Nvidia.h264.decode fails to shutdown 1b0114f fix a surface leak in SurfaceFlinger Bug: 3513017 Change-Id: Ia13ed8c9cdcb1f484e177cdcaff687e7c88a10c3
* | | am 6b6869d5: Merge "mms: mms wap push length check before pdu processing." ↵Simon Wilson2011-03-071-9/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | into gingerbread * commit '6b6869d5c1a203e79dc272f2f0e53c184f44f24a': mms: mms wap push length check before pdu processing.
| * | Merge "mms: mms wap push length check before pdu processing." into gingerbreadSimon Wilson2011-03-071-9/+9
| |\ \
| | * | mms: mms wap push length check before pdu processing.Soojung Shin2011-03-071-9/+9
| | |/ | | | | | | | | | | | | Change-Id: Id5b5572bcd2953e496f03142d13bd2d012225e30 Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
* | | am d581c047: Add missing copyright headers for a couple of files. DO NOT ↵James Dong2011-03-072-0/+32
|\ \ \ | |/ / | | | | | | | | | | | | | | | MERGE Cherry-picked from other branch... * commit 'd581c04722e2610ca5471b9c3d1881043b1205b1': Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
| * | Add missing copyright headers for a couple of files. DO NOT MERGEJames Dong2011-03-072-0/+32
| |/ | | | | | | | | | | | | | | Cherry-picked from other branch... bug - 4025673 Change-Id: I6fd1baaf5625297fb1e358de3a3a632a7f5deb90
* | am ff5a0990: Added to check for supporting mms content-disposition, utf8 ↵Soojung Shin2011-03-043-43/+103
|\ \ | |/ | | | | | | | | | | decoding. * commit 'ff5a09904fb05f2776f1bbf1dd3915f38031190c': Added to check for supporting mms content-disposition, utf8 decoding.
| * Added to check for supporting mms content-disposition, utf8 decoding.Soojung Shin2011-03-043-43/+103
| | | | | | | | | | Change-Id: Ieae1bb2ac36675f569fb21285ca6ef289c367bf7 Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
* | am b028ce55: Merge "Add a protocol property to the APNs and use it." into ↵Lorenzo Colitti2011-03-036-29/+215
|\ \ | |/ | | | | | | | | | | gingerbread * commit 'b028ce55cac88f1778cdad59c63c52a5b66afb69': Add a protocol property to the APNs and use it.
| * Merge "Add a protocol property to the APNs and use it." into gingerbreadLorenzo Colitti2011-03-036-29/+215
| |\
| | * Add a protocol property to the APNs and use it.Lorenzo Colitti2011-02-286-29/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Database changes: - Add a protocol and a roaming_protocol column to the carriers table in the telephony provider database. - Set the protocol and roaming_protocol fields when creating APN objects from the database. 2. ApnSetting class changes: - Add protocol and roamingProtocol fields to the ApnSetting class that encapsulates APN settings within the framework. - Add the fields to ApnSetting.toString and support a new syntax containing the fields in ApnSetting.fromString. - Add a unit test for ApnSetting. 3. Telephony changes: - Specify the APN protocol when setting up a data call, using protocol when not roaming and roaming_protocol when roaming. This change depends on #86896 in the telephony provider, which adds the new column to the database schema on upgrades. Bug: 3333633 Change-Id: If3d9ed4c851d0192849df0d64581db03b066e052
* | | am 6987036f: Merge "Make setupDataCall take a protocol parameter." into ↵Lorenzo Colitti2011-03-037-21/+38
|\ \ \ | |/ / | | | | | | | | | | | | | | | gingerbread * commit '6987036fabbd2c0351986efcfd11e714ae75fdf8': Make setupDataCall take a protocol parameter.
| * | Merge "Make setupDataCall take a protocol parameter." into gingerbreadLorenzo Colitti2011-03-037-21/+38
| |\ \ | | |/
| | * Make setupDataCall take a protocol parameter.Lorenzo Colitti2011-02-287-21/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport the protocol changes to setupDataCall and its callers from master. As in master, hardcode IPv4 connectivity for now. When we add the protocol field to ApnSettings, it will be fetched from there. Bug: 3333633 Change-Id: I51880bc0ec192cbf964ac7bbd6a4b7d2eed41d27
* | | am e23c235c: Merge "Only set KeyEvent long press flag when repeat count ↵Jeff Brown2011-03-031-4/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | equals 1." into gingerbread * commit 'e23c235c662c3028cfb080c6ed60d7defcdd0b69': Only set KeyEvent long press flag when repeat count equals 1.
| * | Merge "Only set KeyEvent long press flag when repeat count equals 1." into ↵Jeff Brown2011-03-031-4/+6
| |\ \ | | | | | | | | | | | | gingerbread
| | * | Only set KeyEvent long press flag when repeat count equals 1.Jeff Brown2011-03-021-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a Gingerbread regression. Bug: 3507021 Change-Id: Ia6030665b6a406332adc0ee0d8ee3cb735338c8e
* | | | am 611af238: DO NOT MERGE: UsbManager: Don\'t display activity picker if ↵Mike Lockwood2011-03-021-1/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | there are no apps available for an accessory * commit '611af238185cf924a425a1a2154b8439b8f8d7a5': DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
| * | | DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps ↵Mike Lockwood2011-03-021-1/+4
| |/ / | | | | | | | | | | | | | | | | | | available for an accessory Change-Id: I1aa578887e42aef375211eadece4c1fddaf234f8 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory ↵Mike Lockwood2011-03-021-29/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | function is disabled when we disconnect" into gingerbread * commit 'c9ac3f5183be3f124f34ed49ac5766e0ba1aff77': DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect
| * | Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is ↵Mike Lockwood2011-03-021-29/+20
| |\ \ | | | | | | | | | | | | disabled when we disconnect" into gingerbread
| | * | DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled ↵Mike Lockwood2011-03-021-29/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when we disconnect BUG: 3493041 Change-Id: I6aeb00a1d91d98a5a0aef4ed97ca5ba68daa24be Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into ↵Simon Wilson2011-03-021-0/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'edc68a001cd94d2011029004cb27231432a18575': Attempt to reduce problems from issue #3183612
| * | | Merge "Attempt to reduce problems from issue #3183612" into gingerbreadSimon Wilson2011-03-021-0/+18
| |\ \ \ | | |/ / | |/| |
| | * | Attempt to reduce problems from issue #3183612Dianne Hackborn2011-02-091-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | java.lang.SecurityException: Neither user 1209 nor current... ...process has android.permission.WAKE_LOCK. It looks like, somehow, the calling uid/pid of the SyncHandler thread is getting corrupted. This change has Looper check for these values changing from their original defaults and, if there is a problem, resetting them and logging a WTF. Hopefully this will avoid crashing the process, while also giving us more helpful error reports about what is going on. Change-Id: Iff06d575951fb8c06e2a3c31141f2907a715eb81
* | | | am 1110748b: DO NOT MERGE: USB accessory support libraryMike Lockwood2011-03-0214-2/+1317
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '1110748b2df664f9c5066819c1f0616eae3394a7': DO NOT MERGE: USB accessory support library
| * | | DO NOT MERGE: USB accessory support libraryMike Lockwood2011-03-0214-2/+1317
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides a mechanism for developing applications to work with USB accessories in versions of android prior to the introduction of the android.hardware.UsbManager APIs. Applications should link against the com.android.future.usb.accessory library to use this support. Change-Id: I0b61e20b63eec42c506f0895a0c9a439bdfdf7f5 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbreadMike Lockwood2011-03-0225-376/+1956
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '40bbf9295d5245d3917629ce15f7b37670aef1ac': DO NOT MERGE: Backport USB accessory support to gingerbread
| * | | DO NOT MERGE: Backport USB accessory support to gingerbreadMike Lockwood2011-03-0125-376/+1956
| | | | | | | | | | | | | | | | Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes ↵Costin Manolache2011-03-014-16/+135
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread * commit 'db52ab69f22e24615eaa2e8f9845e157426d3dd6': DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
| * | | Merge "DO NOT MERGE Backport (with modifications ) some changes from ↵Costin Manolache2011-03-014-16/+135
| |\ \ \ | | | | | | | | | | | | | | | Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
| | * | | DO NOT MERGECostin Manolache2011-03-014-16/+135
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions. This is backward compatible - both new and old authenticators will work with old and new framework, but the functionality will only be present if both sides support it. Change-Id: Ib2838cc2159f45264b38c844cd4c1d6f315d8064
* | | | am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated."Dianne Hackborn2011-02-281-1/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '1de4a2ca58df9bd21e054742f52e0af7a2ed5864': Fix leak when keylock is recreated.
| * \ \ \ am 62619392: Merge "Fix leak when keylock is recreated."Dianne Hackborn2011-02-281-1/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '626193926df0b3c7236e5c244f30d797d9192e0d': Fix leak when keylock is recreated.
| | * \ \ \ Merge "Fix leak when keylock is recreated."Dianne Hackborn2011-02-281-1/+14
| | |\ \ \ \
generated by cgit v1.1 at 2024-09-18 06:41:22 +0000