Jeff Brown
884f344137
Merge "Fix dispatcher crash when input monitoring enabled. Also ensure that we actually log assertion failures."
2011-04-01 16:33:40 -07:00
Scott Main
304fa07898
am 03d4dc3b: am 0fa1d66c: am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
...
* commit '03d4dc3b75c28ee3f502c983fcb8304d556db063':
docs: update homepage announcement for Google IO
2011-04-01 16:27:19 -07:00
Scott Main
753fdd692d
am 0fa1d66c: am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
...
* commit '0fa1d66cccc6041bcc55cf39e77970edbe89109f':
docs: update homepage announcement for Google IO
2011-04-01 16:25:14 -07:00
Scott Main
60d4f1268e
am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
...
* commit '6261861a94448e4fbc26e313ce1410a184a10914':
docs: update homepage announcement for Google IO
2011-04-01 16:22:35 -07:00
Scott Main
59a50e129b
am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
...
* commit 'cb719a48a2f2e9bc47b317f75ebb8320f6ce877c':
docs: update homepage announcement for Google IO
2011-04-01 16:19:30 -07:00
Scott Main
ac8b122389
Merge "docs: update homepage announcement for Google IO" into honeycomb
2011-04-01 16:17:40 -07:00
Jeff Brown
23e0c8c1a1
Fix dispatcher crash when input monitoring enabled.
...
Also ensure that we actually log assertion failures.
Bug: 4203092
Change-Id: I5c14bc41b2255f876858121f5572e2de75cabcc3
2011-04-01 16:15:13 -07:00
Mathias Agopian
27fd410be4
Merge "SurfaceTexture can now force the client to request a buffer"
2011-04-01 14:58:43 -07:00
Mathias Agopian
bf59b168f4
Merge "ANativeWindow_setBuffersGeometry now returns proper error codes"
2011-04-01 14:45:34 -07:00
Mathias Agopian
a5c75c0162
SurfaceTexture can now force the client to request a buffer
...
SurfaceTexture now has the concept of default size a new method,
setDefaultBufferSize() to set it. When the default size is
changed, dequeueBuffer() will return a value telling the
client that it must ask for a new buffer.
The above only applies if the client has not
overriden the buffer size with setGeometry.
Change-Id: I520dc40363054b7e37fdb67d6a2e7bce70326e81
2011-04-01 14:43:35 -07:00
Chet Haase
b629948766
Merge "Fix the build - change a reference to a namespace specification"
2011-04-01 14:34:16 -07:00
James Dong
ade41d686a
Merge "ISurfaceTexture does not have a method getIdentity()"
2011-04-01 14:06:56 -07:00
Andreas Huber
6335a33034
Merge "Remove legacy hack to only drop frames every other late frame"
2011-04-01 14:02:06 -07:00
Andreas Huber
37a0c7f20f
Merge "Fix a webm-seek issue introduced when adding support for streaming webm"
2011-04-01 14:01:09 -07:00
Chet Haase
20cc028bac
Merge "Add logging of graphics acceleration info to bugreports"
2011-04-01 13:28:10 -07:00
Jeff Brown
02988ec716
Merge "Add a little input event consistency verifier."
2011-04-01 12:56:35 -07:00
Robert Greenwalt
38a0a853a3
Merge "Fix a bad merge."
2011-04-01 11:39:02 -07:00
Mike Lockwood
009e05584b
am 1c56976a: am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
...
* commit '1c56976a774434bd279b6181c4fc3c555c4648c2':
Improve Javadoc for USB Manager and MTP/PTP support.
2011-04-01 11:38:52 -07:00
Mike Lockwood
2983e3bb9e
am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
...
* commit '38f04c0f28fc59bc7e893ca6a1ffc4d0745ab8c2':
Improve Javadoc for USB Manager and MTP/PTP support.
2011-04-01 11:37:05 -07:00
Mike Lockwood
d50605b686
am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
...
* commit '11dd5ae97b1cd5889bb66862fd12718da62a9c75':
Improve Javadoc for USB Manager and MTP/PTP support.
2011-04-01 11:34:39 -07:00
Wink Saville
c629a89a2e
am 7c6f532a: am dacb8090: Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
...
* commit '7c6f532ae9b90734edcfe68f8dee078ea8c4b8a5':
Airplane mode on always timed out when camping on LTE
2011-04-01 10:40:57 -07:00
Wink Saville
b6b83d0b82
am 4aff3e36: am 0198fff9: Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
...
* commit '4aff3e363cae550a95c8082ec153bc739fe97db4':
Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
2011-04-01 10:38:40 -07:00
Wink Saville
0586ba6e83
am dacb8090: Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
...
* commit 'dacb80901dfbd7cc18a6f1ede6ca334ed42c038f':
Airplane mode on always timed out when camping on LTE
2011-04-01 10:32:37 -07:00
Wink Saville
8ee9ebcbca
am 0198fff9: Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
...
* commit '0198fff90430d9f974b0284fc3659434406c751b':
Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
2011-04-01 10:30:44 -07:00
Wink Saville
ff47ce57ad
Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
2011-04-01 10:28:22 -07:00
Jean-Baptiste Queru
4160f1379e
am 789d4ade: ignore from gingerbread-plus-aosp
...
* commit '789d4ade299e0c986b9652542b7adf26d38816f4':
Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
2011-03-31 20:10:59 -07:00
Jean-Baptiste Queru
5b2138ab38
ignore from gingerbread-plus-aosp
...
Change-Id: I80fc76acaa18aae7b313bb19489f277ce4700368
2011-03-31 20:08:04 -07:00
Jeff Brown
3847f62209
Add a little input event consistency verifier.
...
The idea is to assist with debugging by identifying cases in which
the input event stream is corrupted.
Change-Id: I0a00e52bbe2716be1b3dfc7c02a754492d8e7f1f
2011-03-31 19:57:00 -07:00
Scott Main
d05bce78a0
am efbdbded: am 77de14d6: am 1ccdc235: am e979332f: docs: fix markup bugs
...
* commit 'efbdbdedeb87c3dd33b6813a1cf48a8d8cadfe39':
docs: fix markup bugs
2011-03-31 19:16:34 -07:00
Scott Main
eb81e071f0
am 77de14d6: am 1ccdc235: am e979332f: docs: fix markup bugs
...
* commit '77de14d64f1b2a36a117869d412a3a74e6823cd7':
docs: fix markup bugs
2011-03-31 19:14:00 -07:00
Scott Main
b3d76339b0
am 1ccdc235: am e979332f: docs: fix markup bugs
...
* commit '1ccdc235716715e7c6f13cab42e4195454e04615':
docs: fix markup bugs
2011-03-31 19:10:56 -07:00
Scott Main
5e4dcd6770
am e979332f: docs: fix markup bugs
...
* commit 'e979332f38e677db4c9d89f695352ed41052553d':
docs: fix markup bugs
2011-03-31 19:06:33 -07:00
Russell Brenner
3d9dda7dc3
am 9e57a4df: am 7b445dd7: am 49b49f8f: Added include/private/hwui/DrawGlInfo.h
...
* commit '9e57a4df48558f4d4c12a98b9720f7603803faca':
Added include/private/hwui/DrawGlInfo.h
2011-03-31 19:03:09 -07:00
Russell Brenner
8bb4414e9f
am 7b445dd7: am 49b49f8f: Added include/private/hwui/DrawGlInfo.h
...
* commit '7b445dd7c0814a39eaf912fa1a871f00d5190550':
Added include/private/hwui/DrawGlInfo.h
2011-03-31 19:00:35 -07:00
Russell Brenner
7faee43a9d
am c6b22e27: Updated JBQ\'s original SurfaceTexture stubs to make webkit MR1 buildable
...
* commit 'c6b22e2727bd3730edd5ad72831a9bb4670d00f3':
Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
2011-03-31 18:55:26 -07:00
Russell Brenner
8fa06d3579
am 49b49f8f: Added include/private/hwui/DrawGlInfo.h
...
* commit '49b49f8fb6d094768d4e093353b34271f2da1bfc':
Added include/private/hwui/DrawGlInfo.h
2011-03-31 18:55:20 -07:00
Russell Brenner
0686717d79
Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
...
Change-Id: If1c1610efcc0e0bc6de88c75712baed91624b1a7
2011-03-31 17:40:08 -07:00
Eric Hassold
bd79bcc9e2
Merge "Initialize reference counter for egl_display_t"
2011-03-31 17:34:13 -07:00
Eric Hassold
7fecf8c1ff
Initialize reference counter for egl_display_t
...
Add missing member initialization for reference counter, used to determine
if a context is ready.
Change-Id: I45f81177ac2851129681f827afe015b60b3cd73c
2011-03-31 16:52:02 -07:00
Wink Saville
1780981fc2
am 2a936154: am b90f9c37: Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE
...
* commit '2a936154f607d9454864045bd798ff22618de41a':
Telephony: Add Powerdown Cause to PDP Deactivate Message.
2011-03-31 15:55:02 -07:00
Wink Saville
a83d4fca27
am b90f9c37: Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE
...
* commit 'b90f9c370e5b1b1825016e48b864e8eda6d5f89c':
Telephony: Add Powerdown Cause to PDP Deactivate Message.
2011-03-31 15:52:58 -07:00
Wink Saville
9cf55844ef
Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE
2011-03-31 15:51:07 -07:00
Wink Saville
64b4945715
am cac1411e: am 11feacb3: Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE
...
* commit 'cac1411e9966b155a099f24720104a84de7aa50b':
Telephony: Cleanup of SIM handling in CdmaLteSST.
2011-03-31 13:21:50 -07:00
Wink Saville
cb528cf26a
am 11feacb3: Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE
...
* commit '11feacb348e624bcdbb073a32c1fc1d8bdc7bae3':
Telephony: Cleanup of SIM handling in CdmaLteSST.
2011-03-31 13:19:06 -07:00
Wink Saville
51e9368cd5
Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE
2011-03-31 13:16:41 -07:00
Glenn Kasten
b859c47f8a
am 69250839: am 4ed59de6: am ffa670b5: Bug 4167061
...
* commit '69250839bb0ae94305ee1ac9a452b98d67acc5cf':
Bug 4167061
2011-03-31 11:11:43 -07:00
Glenn Kasten
0db86b97a0
am 4ed59de6: am ffa670b5: Bug 4167061
...
* commit '4ed59de640e46e42b5af3d79448be9da6e79667d':
Bug 4167061
2011-03-31 11:08:52 -07:00
Glenn Kasten
bb150be680
am ffa670b5: Bug 4167061
...
* commit 'ffa670b5b00b8b4c5a4296f9a1ac382c0e647894':
Bug 4167061
2011-03-31 11:06:41 -07:00
Robert Greenwalt
2f5ec4057b
am 026ba931: (-s ours) Merge "Fix the build." into honeycomb-plus-aosp
...
* commit '026ba931d448919ffc515f7e66fe96950f89d22e':
Fix the build.
2011-03-31 10:53:58 -07:00
Robert Greenwalt
b1e4542e98
Merge "Fix the build." into honeycomb-plus-aosp
2011-03-31 10:47:32 -07:00