Andreas Huber
1aebc47141
Merge "Remove legacy hack to only drop frames every other late frame"
2011-04-01 14:02:06 -07:00
Andreas Huber
5e9c3de539
Merge "Fix a webm-seek issue introduced when adding support for streaming webm"
2011-04-01 14:01:09 -07:00
Andreas Huber
21796929d3
Fix a webm-seek issue introduced when adding support for streaming webm
...
Change-Id: I52ec841832077603ee035f7a648316349513e978
related-to-bug: 4199894
2011-04-01 13:36:53 -07:00
James Dong
a93f84e067
ISurfaceTexture does not have a method getIdentity()
...
Change-Id: I81e6b0335747bd5c2c4b15c9f8c99100842a06c1
2011-04-01 13:29:27 -07:00
Chet Haase
09bc5f5b57
Merge "Add logging of graphics acceleration info to bugreports"
2011-04-01 13:28:10 -07:00
Andreas Huber
2334d82073
Remove legacy hack to only drop frames every other late frame
...
Change-Id: I197e568d292341c330efb394c41aa9af0e74b081
related-to-bug: 4203195
2011-04-01 13:27:42 -07:00
Chet Haase
9c1e23baf5
Add logging of graphics acceleration info to bugreports
...
Change-Id: I9fa4cda6ccf92df9d1c644ccdc0e7274a30106e0
2011-04-01 13:24:53 -07:00
Jeff Brown
bc2278b95f
Merge "Add a little input event consistency verifier."
2011-04-01 12:56:35 -07:00
Robert Greenwalt
165121f64a
Merge "Fix a bad merge."
2011-04-01 11:39:02 -07:00
Mike Lockwood
8538149572
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
1c56976a77
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
38f04c0f28
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
Mike Lockwood
11dd5ae97b
Improve Javadoc for USB Manager and MTP/PTP support.
...
Bug: 4091519
Change-Id: Ida79593d5a984f7ffd0934ae7bded23b8faf9eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-01 14:11:50 -04:00
Robert Greenwalt
13ec406381
Fix a bad merge.
...
Re-add change 103769 (Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f) from gingerbread
after the bad merge was reverted by master change 104487
(Change-Id: I8fad7ee11f4b26630f3cc4b31cc9cafbe66b3bf4).
bug:4157610
Change-Id: I96a75d71220cc7886a5b186b415d8dacf6951ca6
2011-04-01 10:51:22 -07:00
Wink Saville
d9dc236454
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
19bb5bc4ad
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
7c6f532ae9
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
4aff3e363c
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
dacb80901d
Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
2011-04-01 10:28:22 -07:00
Wink Saville
95bc2b7564
Airplane mode on always timed out when camping on LTE
...
While on LTE, GsmDataConnectionTracker is implicitly associated with CdmaServiceTracker.
CdmaServiceTracker asynchronously waits for the disconnection of data before turning off
the Radio but GsmDataConnection does not notify the disconnection due to different logic
in GsmServiceTracker.
This fix is to have common airplane mode toggle logic on both GSM and CDMA flavors.
Change-Id: I67ff82a59a2243856ae3e7c5e37b5726bcbf3c94
2011-04-01 10:11:18 -07:00
Wink Saville
0198fff904
Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
...
This allows the system property to be updated at runtime and
for testing.
Change-Id: I75788e5fa70efdbb9186b9f03baac1d9e6b3febd
2011-04-01 08:53:12 -07:00
Mathias Agopian
da5a4440f0
ANativeWindow_setBuffersGeometry now returns proper error codes
...
Change-Id: Iac59d513fa1d4a55b8378000714d344ef3e2e0a4
2011-03-31 20:59:58 -07:00
Jean-Baptiste Queru
827107f4ec
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
789d4ade29
ignore from gingerbread-plus-aosp
...
Change-Id: I80fc76acaa18aae7b313bb19489f277ce4700368
2011-03-31 20:08:04 -07:00
Jeff Brown
21bc5c917d
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
ff33829048
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
efbdbdedeb
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
77de14d64f
am 1ccdc235: am e979332f: docs: fix markup bugs
...
* commit '1ccdc235716715e7c6f13cab42e4195454e04615':
docs: fix markup bugs
2011-03-31 19:10:56 -07:00
Scott Main
1ccdc23571
am e979332f: docs: fix markup bugs
...
* commit 'e979332f38e677db4c9d89f695352ed41052553d':
docs: fix markup bugs
2011-03-31 19:06:33 -07:00
Russell Brenner
616fb9a38a
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
9e57a4df48
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
64802ca780
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
7b445dd7c0
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
c6b22e2727
Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
...
Change-Id: If1c1610efcc0e0bc6de88c75712baed91624b1a7
2011-03-31 17:40:08 -07:00
Eric Hassold
694bf4ae62
Merge "Initialize reference counter for egl_display_t"
2011-03-31 17:34:13 -07:00
Scott Main
e979332f38
docs: fix markup bugs
...
Change-Id: I230d16e6dc0fe166a61a30a92b2666e0856298a0
2011-03-31 17:08:24 -07:00
Eric Hassold
8bdf09b0d7
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
3b2c5a9a09
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
2a936154f6
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
b90f9c370e
Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE
2011-03-31 15:51:07 -07:00
Wink Saville
261306889e
Telephony: Add Powerdown Cause to PDP Deactivate Message.
...
Modem needs to know if PDP deactivation is due to UE power down so that it can do detach.
Change-Id: Ie63f90f005845fcd6bfab421f193058b6e2e78d5
2011-03-31 15:46:25 -07:00
Wink Saville
99eefad9ab
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
Russell Brenner
49b49f8fb6
Added include/private/hwui/DrawGlInfo.h
...
Change-Id: If50ccabb8761a994fa1f7aef4fbdb668c6160b0c
2011-03-31 13:20:52 -07:00
Wink Saville
cac1411e99
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
11feacb348
Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE
2011-03-31 13:16:41 -07:00
Glenn Kasten
ea2c96541b
am 69250839: am 4ed59de6: am ffa670b5: Bug 4167061
...
* commit '69250839bb0ae94305ee1ac9a452b98d67acc5cf':
Bug 4167061
2011-03-31 11:11:43 -07:00
Glenn Kasten
69250839bb
am 4ed59de6: am ffa670b5: Bug 4167061
...
* commit '4ed59de640e46e42b5af3d79448be9da6e79667d':
Bug 4167061
2011-03-31 11:08:52 -07:00
Glenn Kasten
4ed59de640
am ffa670b5: Bug 4167061
...
* commit 'ffa670b5b00b8b4c5a4296f9a1ac382c0e647894':
Bug 4167061
2011-03-31 11:06:41 -07:00
Robert Greenwalt
78904ae4e4
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
026ba931d4
Merge "Fix the build." into honeycomb-plus-aosp
2011-03-31 10:47:32 -07:00