Eino-Ville Talvala
e8d7d03d59
am ca2640b2: am 0a273592: Merge "Add video stabilization control to Camera parameters." into ics-mr0
...
* commit 'ca2640b2ab4136eefe138baf07dcfcbaea86da17':
Add video stabilization control to Camera parameters.
2011-10-12 20:01:08 -07:00
Jeff Brown
2b60484225
am 241fe477: am 58bf986c: Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0
...
* commit '241fe477edba539bcc58df4410c307d9540a4233':
Use ashmem for CursorWindows. Bug: 5332296
2011-10-12 12:37:46 -07:00
Romain Guy
fabdc4fba7
am bd3f526e: Merge "Correctly apply transforms when getting a TextureView\'s bitmap Bug #5439406 "
...
* commit 'bd3f526eabcdb77cb2b3ed062072a959924dd95b':
Correctly apply transforms when getting a TextureView's bitmap Bug #5439406
2011-10-12 12:37:13 -07:00
Eino-Ville Talvala
ca2640b2ab
am 0a273592: Merge "Add video stabilization control to Camera parameters." into ics-mr0
...
* commit '0a2735928030229b3340074eb11c2423342fda93':
Add video stabilization control to Camera parameters.
2011-10-12 10:40:11 -07:00
Eino-Ville Talvala
0a27359280
Merge "Add video stabilization control to Camera parameters." into ics-mr0
2011-10-12 10:37:57 -07:00
Eino-Ville Talvala
037abb8bb0
Add video stabilization control to Camera parameters.
...
Hardware video stabilization reduces camera shake in preview
and in recorded videos. It has no effect on still image capture.
Convenience accessor methods hidden for now.
Change-Id: Ie18450bff662b2ef98b85d19719beefc180975fc
2011-10-12 10:34:10 -07:00
Jeff Brown
241fe477ed
am 58bf986c: Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0
...
* commit '58bf986c3e3948242e89654e6d59b97a21345582':
Use ashmem for CursorWindows. Bug: 5332296
2011-10-11 15:33:28 -07:00
Romain Guy
a9dc86b21d
Correctly apply transforms when getting a TextureView's bitmap
...
Bug #5439406
Change-Id: I271a9a2e38f5b3600dc158f8f442a6b0893f472b
2011-10-11 14:06:21 -07:00
Jeff Brown
0cde89f5f0
Use ashmem for CursorWindows.
...
Bug: 5332296
The memory dealer introduces additional delays for reclaiming
the memory owned by CursorWindows because the Binder object must
be finalized. Using ashmem instead gives CursorWindow more
direct control over the lifetime of the shared memory region.
The provider now allocates the CursorWindows and returns them
to clients with a read-only protection bit set on the ashmem
region.
Improved the encapsulation of CursorWindow. Callers shouldn't
need to care about details like how string fields are allocated.
Removed the compile-time configuration of string and numeric
storage modes to remove some dead weight.
Change-Id: I07c2bc2a9c573d7e435dcaecd269d25ea9807acd
2011-10-11 11:03:19 -07:00
Jeff Brown
f27eeeb28b
am 270928bd: Merge changes Idbfeb3cc,I03e8e2e7,Iff9eed78
...
* commit '270928bd4a1db1dc0d989f4e9897a81ab865e30e':
Fix regression in CursorWindow.getString() Bug: 5332296
Clean up CursorWindow lifetime. Bug: 5332296
Fix regression in CursorWindow.copyStingToBuffer. Bug: 5332296
2011-10-07 15:09:29 -07:00
Jeff Brown
270928bd4a
Merge changes Idbfeb3cc,I03e8e2e7,Iff9eed78
...
* changes:
Fix regression in CursorWindow.getString() Bug: 5332296
Clean up CursorWindow lifetime. Bug: 5332296
Fix regression in CursorWindow.copyStingToBuffer. Bug: 5332296
2011-10-07 15:08:24 -07:00
Romain Guy
25cfe925c5
am 69f906e0: Merge "Stupid fixed point math. Bug #5423215 "
...
* commit '69f906e075753328e6da0b7f6f7638dd453092ed':
Stupid fixed point math. Bug #5423215
2011-10-07 15:05:27 -07:00
Romain Guy
5a6d3a4c03
Stupid fixed point math.
...
Bug #5423215
Change-Id: I39379e1f8fb4d59de4ede6e4fe7cf7a2c7cc625a
2011-10-07 15:03:24 -07:00
Jeff Brown
d0ff68da6a
Fix regression in CursorWindow.copyStingToBuffer.
...
Bug: 5332296
Change-Id: Iff9eed786f0a8293b6156f883a66a322ddad5e99
2011-10-07 13:28:18 -07:00
Jeff Brown
bccfeacfb6
am f0a9181d: Merge "Clean up CursorWindow code. Bug: 5332296"
...
* commit 'f0a9181d0904cc50acf852a64be0c7279e098783':
Clean up CursorWindow code. Bug: 5332296
2011-10-06 16:31:07 -07:00
Jeff Brown
3bc6bbc92c
Clean up CursorWindow code.
...
Bug: 5332296
The code is functionally equivalent, but a little more efficient
and much easier to maintain.
Change-Id: I90670a13799df05831843a5137ab234929281b7c
2011-10-06 14:40:13 -07:00
Jason Sams
fd0dcba895
am 66fb1f3f: Merge "Wrapping new API with #defines to prevent old apps from using them."
...
* commit '66fb1f3f3d8038d6bf216b52ba21a7e42fda040f':
Wrapping new API with #defines to prevent old apps from using them.
2011-10-05 12:03:36 -07:00
Jason Sams
66fb1f3f3d
Merge "Wrapping new API with #defines to prevent old apps from using them."
2011-10-05 12:01:51 -07:00
Romain Guy
cd1a8f3b93
am ac0757a4: Merge "Canvas.getClipBounds() was broken and unreliable with OpenGL ES 2.0"
...
* commit 'ac0757a47c91a197111b457d209577560f4c18c7':
Canvas.getClipBounds() was broken and unreliable with OpenGL ES 2.0
2011-10-05 06:37:10 -07:00
Romain Guy
ac0757a47c
Merge "Canvas.getClipBounds() was broken and unreliable with OpenGL ES 2.0"
2011-10-04 19:22:41 -07:00
Romain Guy
ed7a8fc768
Canvas.getClipBounds() was broken and unreliable with OpenGL ES 2.0
...
This bug was affecting several third party applications. The bug was
introduced by an optimization that prevented the local clip to be
recomputed when needed.
Change-Id: I7b5c464db21b5ff1a7274af75a3a64d0e9d84772
2011-10-04 19:21:27 -07:00
Jason Sams
0de1a6632e
am 3c1951c4: Merge "Fix crash running old HC apps."
...
* commit '3c1951c442e40f7f46775acfc8a22c24f04d8cfc':
Fix crash running old HC apps.
2011-10-04 15:55:06 -07:00
Jason Sams
3c1951c442
Merge "Fix crash running old HC apps."
2011-10-04 15:53:37 -07:00
Jason Sams
795072ec7b
Fix crash running old HC apps.
...
Change-Id: If7206de334868cb40eb8e5dd04fbe8c70bc1d614
2011-10-04 15:46:57 -07:00
Dianne Hackborn
08286c1224
am c04db7e0: Fix handling of "allow fds" state.
...
* commit 'c04db7e06737c5b9bae276ac462858d44002672e':
Fix handling of "allow fds" state.
2011-10-03 21:23:02 -07:00
Dianne Hackborn
c04db7e067
Fix handling of "allow fds" state.
...
Didn't take into account nesting of bundles. Boo.
Change-Id: Ic8cf21ad8d6f4938a3e105128624c9d162310d01
2011-10-03 21:09:35 -07:00
Jeff Brown
19a8c09892
am 32cec0e3: Merge "Transfer large bitmaps using ashmem. Bug: 5224703"
...
* commit '32cec0e36b044dfac81a1bbdee23e128bfdab545':
Transfer large bitmaps using ashmem. Bug: 5224703
2011-10-03 18:30:03 -07:00
Jeff Brown
6579a9d6fe
Transfer large bitmaps using ashmem.
...
Bug: 5224703
Change-Id: If385a66adf4c6179a0bb49c0e6d09a9567e23808
2011-10-03 17:28:13 -07:00
Dianne Hackborn
e08ce59a1d
am 7d657e5c: Merge "Add mechanism for Parcel to not allow FDs to be written to it."
...
* commit '7d657e5cfacec1f0be845c86dd4336e7efde5ede':
Add mechanism for Parcel to not allow FDs to be written to it.
2011-10-03 17:15:39 -07:00
Dianne Hackborn
9ecebbfbf7
Add mechanism for Parcel to not allow FDs to be written to it.
...
This is to help implement issue #5224703 .
Change-Id: I026a5890495537d15b57fe61227a640aac806d46
2011-10-03 16:58:41 -07:00
Jamie Gennis
7d324f8c60
am 94309e3f: Merge "SurfaceTexture: parameterize the texture target"
...
* commit '94309e3fc7c3d8fe54f8edb9cf8b59ab62628ff6':
SurfaceTexture: parameterize the texture target
2011-09-30 15:30:10 -07:00
Jamie Gennis
8606fefa21
SurfaceTexture: parameterize the texture target
...
This change adds a hack to allow Android Browser to use a SurfaceTexture
to stream RGBA images to a GL_TEXTURE_2D texture object.
Change-Id: Idb90064d5d4b920959ef3be7451362ac5012460e
2011-09-30 14:19:41 -07:00
Romain Guy
c4204da3fc
am 638f17c1: Merge "TextureView works best when it draws stuff. Bug #5391188 "
...
* commit '638f17c1b72ac226569dc08e2232adaf97349095':
TextureView works best when it draws stuff. Bug #5391188
2011-09-29 17:25:27 -07:00
Romain Guy
59c7f80dd2
TextureView works best when it draws stuff.
...
Bug #5391188
Change-Id: I5e754881ccb08ff288ebd60de77282c9cbcf3f86
2011-09-29 17:21:45 -07:00
Mathias Agopian
2757a63170
am 3c199016: Merge "may fix the build"
...
* commit '3c1990167450b77bfdae9e99c312ed241bc672df':
may fix the build
2011-09-28 17:36:24 -07:00
Mathias Agopian
acde31e124
may fix the build
...
Change-Id: I065b1e6652f0e800ba5674a6d9aa954c3ac6c790
2011-09-28 17:33:11 -07:00
Alex Sakhartchouk
f6576d9631
Wrapping new API with #defines to prevent old apps from using them.
...
Change-Id: Ib3a2d19544ad72987ebec09d465bec8eeb6423c8
2011-09-28 15:23:18 -07:00
Jamie Gennis
bc04810c92
am feb158b3: Merge changes Ib302d79e,Ib4ee085f
...
* commit 'feb158b3cbd0dada89b0437c3e09699ba3f982de':
SurfaceFlinger: set layer names on SurfaceTextures
SurfaceTexture: add name support
2011-09-27 14:25:57 -07:00
Jamie Gennis
feb158b3cb
Merge changes Ib302d79e,Ib4ee085f
...
* changes:
SurfaceFlinger: set layer names on SurfaceTextures
SurfaceTexture: add name support
2011-09-27 14:24:09 -07:00
Mathias Agopian
0c3541a614
am 6098a216: Merge "Region cannot handle malformed Rects. Abort the Region op in that case."
...
* commit '6098a2162a9dc0c315c2b524d1643c0e16daa940':
Region cannot handle malformed Rects. Abort the Region op in that case.
2011-09-26 19:17:42 -07:00
Mathias Agopian
0ee06d116b
Region cannot handle malformed Rects. Abort the Region op in that case.
...
Bug: 5331198, 5334829
Change-Id: Ib1fdbf6fb291e7f1191ccfe16b5ff29d73e7a474
2011-09-26 15:58:20 -07:00
Jason Sams
dca3baebf2
am d1a2f36b: Merge "Remove unused fields in ProgramRaster"
...
* commit 'd1a2f36b834534f422a17fc2324f5af839f29862':
Remove unused fields in ProgramRaster
2011-09-26 11:58:45 -07:00
Bart Sears
33940a594d
am c52feae9: Merge "Revert "Transfer large bitmaps using ashmem. Bug: 5224703""
...
* commit 'c52feae9482e18f48ae1c8f9910d51c00e36f074':
Revert "Transfer large bitmaps using ashmem. Bug: 5224703"
2011-09-25 14:36:18 -07:00
Bart Sears
b637717096
Revert "Transfer large bitmaps using ashmem. Bug: 5224703"
...
This reverts commit 56c58f66b97d22fe7e7de1f7d9548bcbe1973029
This CL was causing the browser to crash when adding bookmarks, visiting the bookmarks page, and sharing pages (see bug http://b/issue?id=5369231
2011-09-25 14:30:21 -07:00
Jeff Brown
69e7be8d7c
am 4113acf1: Merge "Transfer large bitmaps using ashmem. Bug: 5224703"
...
* commit '4113acf10a60f2e7cfbb835e50ef520df8257cb3':
Transfer large bitmaps using ashmem. Bug: 5224703
2011-09-24 20:51:02 -07:00
Jeff Brown
56c58f66b9
Transfer large bitmaps using ashmem.
...
Bug: 5224703
Change-Id: Ic7481dd9f173986f085a8bbdcc59bbe9830d7a44
2011-09-23 21:20:47 -07:00
Jason Sams
94aaed3846
Remove unused fields in ProgramRaster
...
Change-Id: I70c9d47674c956ec850c178c7aaa9a5e3dd9dffb
2011-09-23 14:18:53 -07:00
Jamie Gennis
44a052203e
SurfaceTexture: add name support
...
This change adds support for setting a string that can be used to
identify a SurfaceTexture object in log messages.
Change-Id: Ib4ee085f36c8830dc964c05ef1654f5a55dfcd60
2011-09-22 17:49:10 -07:00
Jason Sams
00e3abadea
am dd0ffde6: Merge "Cleanup RS logs Reduce the startup/shutdown info and format the logs in a consistent manner."
...
* commit 'dd0ffde6f553afb9fcdbab198102df540a4470a0':
Cleanup RS logs Reduce the startup/shutdown info and format the logs in a consistent manner.
2011-09-21 08:55:04 -07:00
Jason Sams
dd0ffde6f5
Merge "Cleanup RS logs Reduce the startup/shutdown info and format the logs in a consistent manner."
2011-09-21 08:53:10 -07:00