Jean-Baptiste Queru
374e00c9a8
Merge from honeycomb-plus-aosp
...
Change-Id: I66f5d4f8b703789a02f7e137235e9321fc413f5d
2011-05-12 17:23:41 -07:00
Dianne Hackborn
3158e56e9b
Merge "resolved conflicts for merge of 0e59729b to master"
2011-05-12 17:15:22 -07:00
John Reck
a41db3722f
Merge "Adding functions to query the state of a WebElement."
2011-05-12 17:00:38 -07:00
Chia-chi Yeh
e71c36df7e
Merge "Add a method to create ParcelFileDescriptors from DatagramSockets."
2011-05-12 16:55:58 -07:00
Dima Zavin
1d68c8ce9a
Merge "update for new audio.h header location"
2011-05-12 16:06:20 -07:00
Dianne Hackborn
f543d5de23
resolved conflicts for merge of 0e59729b to master
...
Change-Id: I2d3a6bddf66b1df0c101c45ea2fec1cf65caf01b
2011-05-12 15:39:41 -07:00
Teng-Hui Zhu
094766172f
am a0e661b4: am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
...
* commit 'a0e661b4e4f489fa7c5c2ebadcffc8e6f71132eb':
Fix the Uri parsing issue
2011-05-12 15:05:29 -07:00
Dianne Hackborn
d040883030
am 97280816: am 0f1de9ad: New compat mode front end: UI and persistence.
...
* commit '972808164adde6c0784e9c836d06219a9cf7eb7f':
New compat mode front end: UI and persistence.
2011-05-12 15:05:19 -07:00
Teng-Hui Zhu
b9c36527f1
am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
...
* commit 'c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
Fix the Uri parsing issue
2011-05-12 15:01:56 -07:00
Dianne Hackborn
aef4c4a98f
am 0f1de9ad: New compat mode front end: UI and persistence.
...
* commit '0f1de9adde0b52d2a385a76232bd7ac30c3eeea2':
New compat mode front end: UI and persistence.
2011-05-12 15:01:53 -07:00
Chet Haase
3caeb9b176
Merge "Antialiasing for rectangles"
2011-05-12 14:57:51 -07:00
Teng-Hui Zhu
4755b0da13
Merge "Fix the Uri parsing issue" into honeycomb-mr2
2011-05-12 14:11:25 -07:00
Wink Saville
020c4787cc
am 9c7c8794: am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE
...
* commit '9c7c87941446cdd1263a87a8c4cc5672082c7e12':
Fix initialization of RouteInfo
2011-05-12 14:08:05 -07:00
Wink Saville
d11e133a4e
am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE
...
* commit '76a118dd9e1bc8be33e1e22b7264b7f918f6f050':
Fix initialization of RouteInfo
2011-05-12 14:03:31 -07:00
Svetoslav Ganov
e9aab723a9
Merge "Propagating hover events to JavaScript in WebView"
2011-05-12 13:43:35 -07:00
Andreas Huber
ab5c0e2a0c
Merge "A fix to the MPEG4Extractor to support 16-bit sample sizes."
2011-05-12 13:40:37 -07:00
Wink Saville
adfda25efe
Merge "Fix initialization of RouteInfo" into honeycomb-LTE
2011-05-12 13:26:44 -07:00
Andreas Huber
5a05ff998a
Merge "The decoder wrapper is no longer needed. Also disable building old-style decoders."
2011-05-12 13:01:29 -07:00
Alex Sakhartchouk
765e65a8db
Merge "rsLib cleanup"
2011-05-12 10:15:17 -07:00
Andreas Huber
2988ef907a
Merge "Squashed commit of the following:"
2011-05-12 09:29:20 -07:00
Mathias Agopian
0ad71a97c6
fix (Again) adding OES postfix when looking for gl functions
...
Change-Id: Ib14723ed5355fdc423226ec20a32e26fe7dd68fe
2011-05-11 20:37:47 -07:00
Mathias Agopian
8747ce61e9
Merge "add OES postfix without truncating function"
2011-05-11 20:33:43 -07:00
Chia-chi Yeh
12ff0961f6
Merge "Extract NetworkManagementService out from Tethering to ConnectivityService."
2011-05-11 18:33:22 -07:00
Jeff Boody
e647f3c76c
add OES postfix without truncating function
...
Change-Id: Id47304cf38914190cec58d703801f456ab916f63
2011-05-11 18:05:49 -07:00
Mathias Agopian
cf46eb9817
fix onFrameAvailable
...
Change-Id: I391fe9f6684ac9fd4f91416ce18b583f7087d966
2011-05-11 18:01:51 -07:00
Mathias Agopian
68c7794183
Add SurfaceTexture logging
...
Change-Id: If1b74be5230813fb76429935d88b9d4a7c41700c
2011-05-11 18:01:51 -07:00
Mathias Agopian
8072711307
Implement {Surface|SurfaceTextureClient}::setSwapInterval()
...
Change-Id: I8382e346ddaa2c4c8ff56ac3ffd7f0109572f188
2011-05-11 18:01:51 -07:00
Mathias Agopian
7a5b22c4e3
new tests for SurfaceTexture synchronous mode
...
Change-Id: Icfdaa625238246f8d0224efe28fdf2c1c24203f8
2011-05-11 18:01:51 -07:00
Mathias Agopian
b3e518c820
Add the concept of synchronous dequeueBuffer in SurfaceTexture
...
Change-Id: Ic94cbab092953243a0746e04bbe1b2eb0cc930ef
2011-05-11 18:01:51 -07:00
Mathias Agopian
eafabcdc16
unify SurfaceTexture and Surface
...
Change-Id: I49da2f5d8408e4cd7e148cfb777bb4ff68cd8f37
2011-05-11 18:01:51 -07:00
Mathias Agopian
c04f153353
Fix a bug where setgeometry couldn't be undone
...
This change the binder protocol between SurfaceTextureClient
and SurfaceTexture. dequeueBuffer() now takes the requested
parameters for the buffer. SurfaceTexture decides if the
buffer needs to be reallocated and does the allocation
if needed. In that case it returns BUFFER_NEEDS_REALLOCATION
to tell SurfaceTextureClient that it needs to call
requestBuffer (which all parameters have been removed) to
acquire a pointer to the buffer.
dequeueBuffer and requestBuffer could be folded into a single
IPC call, but we chose to optimize the case where buffers are
not created and avoid some complexity in the marshalling code.
Change-Id: I097a7f6f40a3491e10f3f3742eab33999286c304
2011-05-11 18:01:51 -07:00
James Dong
f38ab8b3a4
Merge "Fix setDataSource(Context, Uri, Map<String,String> headers)"
2011-05-11 17:52:32 -07:00
RoboErik
fe9500d75e
Merge "Update Calendars table to v300"
2011-05-11 16:47:17 -07:00
John Reck
3cb61ab1eb
Merge "Add ROOT_ID to Accounts column"
2011-05-11 16:12:00 -07:00
James Dong
48d9423f29
Merge "Expose the track informational event for testing"
2011-05-11 15:59:29 -07:00
Mathias Agopian
1e1f2c9970
Merge "fix libagl surface initialization"
2011-05-11 13:43:04 -07:00
Mathias Agopian
69e43b71af
fix libagl surface initialization
...
this broke recently when removing copybit support.
Change-Id: I5cc7ff7f49268411c6c2cfb2d97590d52b13dbd5
2011-05-11 13:41:09 -07:00
Irfan Sheriff
461924302a
am f450fd6a: am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread
...
* commit 'f450fd6af61248b90ddb9ed0bb9780c0d3378029':
Move Wifi Ap configuration to flat file
2011-05-11 13:12:19 -07:00
Robert Ly
91f6e9a936
am 9d93c9c4: am 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link to pic board
...
* commit '9d93c9c4d761aa25fb61988bf40a900a18de79ae':
doc change: adding link to pic board
2011-05-11 13:12:16 -07:00
Wink Saville
f8ba7a1ba6
am e86dbac5: am db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTE
...
* commit 'e86dbac583f442e37bfaa95f9427f491b62d53f3':
Refactor IccRecords and IccCard
2011-05-11 13:11:17 -07:00
Conley Owens
25bc410b31
am 041aa34e: am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap file descriptors."
...
* commit '041aa34e089d7b194a5d93c682c3af3d3116d3f3':
Add missing clean-up of idmap file descriptors.
2011-05-11 13:10:56 -07:00
Jake Hamby
dc128f220b
am ee60f3fb: resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp
...
* commit 'ee60f3fb1b4e61ac8027293a658ba710e36d36b6':
Enable support for SMS national language shift tables.
2011-05-11 13:09:42 -07:00
Eric Fischer
99c8ce8275
am 6819c677: (-s ours) am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '6819c677b9d8d9a5f60f1a35e045300b1a8aec96':
Import revised translations. DO NOT MERGE
2011-05-11 13:09:13 -07:00
Eric Fischer
c8281fdf00
am ca43ef6b: (-s ours) am affca8fa: am f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'ca43ef6bc7ea52efb17718017e1f883e33504c05':
Import revised translations. DO NOT MERGE
2011-05-11 13:08:50 -07:00
Joe Onorato
5354504ec4
am 0fe56853: am 37c077d3: am 81faa44c: Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2
...
* commit '0fe56853fd88c34aba37b04be256a0e51c1bbff7':
Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets.
2011-05-11 13:07:55 -07:00
Robert Greenwalt
55a018e918
am 441bc9a6: am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
...
* commit '441bc9a6f41ca1678a6c965bec7e2f18227ac100':
Fix the adding of host routes.
2011-05-11 13:07:38 -07:00
Christopher Tate
7d31ba319d
Merge "Full local backup infrastructure"
2011-05-11 12:51:31 -07:00
Dianne Hackborn
6c15faf98e
Merge "resolved conflicts for merge of 037b54cf to master"
2011-05-11 12:50:39 -07:00
Dianne Hackborn
0b9be697bf
resolved conflicts for merge of 037b54cf to master
...
Change-Id: I1bc2827596a349963d8aa2b63b3f7801f155668a
2011-05-11 10:59:54 -07:00
Irfan Sheriff
6bb3af87fd
am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread
...
* commit 'aa1fd70100d1af393c8d4ebe9cb36a8fa15a3633':
Move Wifi Ap configuration to flat file
2011-05-11 10:06:33 -07:00