Commit Graph

31436 Commits

Author SHA1 Message Date
David Li
65948aa046 GLES2Debugger: Added DbgContext and vertex data capturing.
Send VBO related commands to client, which tracks the state.
Maintain index buffer content and vertex attrib pointer/buffer state on server.
During glDrawArrays/Elements, send user memory data to client.

Change-Id: Ia920e90479329b301ae4b5735e833eeb20293c94
Signed-off-by: David Li <davidxli@google.com>
2011-03-10 16:40:37 -08:00
Ed Heyl
d625d10792 am cc7d3c53: am b22bb1da: Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
* commit 'cc7d3c539abd4affd5e95cff8740d9303deac63d':
  UsbManager: Fix broken Javadoc links
2011-03-09 13:06:36 -08:00
Ed Heyl
20a46fc8e9 am b22bb1da: Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
* commit 'b22bb1dae1213fe9383020a53eeb89de40e7bbd0':
  UsbManager: Fix broken Javadoc links
2011-03-09 12:56:17 -08:00
Ed Heyl
97fe840e61 Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1 2011-03-09 12:53:38 -08:00
Eric Laurent
1158bdafdc am 2dc78477: am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1
* commit '2dc78477364bd4accb9a603baaafca9a5523dcec':
  Fix issue 3439872: video chat and bluetooth SCO
2011-03-09 11:00:22 -08:00
Eric Laurent
9d43fc8dde am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1
* commit 'cc34967fdcbf64826a068901d6fb1bd8bb1fa99f':
  Fix issue 3439872: video chat and bluetooth SCO
2011-03-09 10:57:49 -08:00
Eric Laurent
0708bdbda4 Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1 2011-03-09 10:56:01 -08:00
Shimeng (Simon) Wang
dc2b11d2d3 am 246b2b31: am 12c37caf: Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
* commit '246b2b313cb545da9d6f791b90d5a1cc4316114e':
  Consider mInitialScale when setting min zoom scale.
2011-03-09 10:53:44 -08:00
Shimeng (Simon) Wang
50bfd60603 am 12c37caf: Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
* commit '12c37cafe184d5a6ac2a7a097c2fc616e5c1a6c8':
  Consider mInitialScale when setting min zoom scale.
2011-03-09 10:51:26 -08:00
Mike Lockwood
6f57ec5c09 am 094c9900: am 2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
* commit '094c9900de383f0934f74cedef0d24b6d8a14905':
  Change UsbManager.requestPermission to only grant permission temporarily
2011-03-09 10:51:16 -08:00
Shimeng (Simon) Wang
e720a884e9 Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1 2011-03-09 10:48:57 -08:00
Mike Lockwood
36b89fe39e am 2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
* commit '2c3ed82600af117e791a087330a198fe90d298b7':
  Change UsbManager.requestPermission to only grant permission temporarily
2011-03-09 10:48:13 -08:00
Mike Lockwood
8890a546d8 Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1 2011-03-09 10:44:19 -08:00
Andreas Huber
2fbb4e4c4c Merge "An HTTP datasource for stagefright using the chromium code." 2011-03-09 10:37:20 -08:00
Jean-Michel Trivi
1dc2bb9165 am 8d0e2b98: am 5fa7aac8: Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1
* commit '8d0e2b9857e5f77ced233dc408a7acd9e8ab2e8c':
  Fix bug 4064086 Use a death handler on audio focus changes from mode
2011-03-09 10:22:56 -08:00
Jean-Michel Trivi
6d0fc1cd0d am 5fa7aac8: Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1
* commit '5fa7aac81b471557cd944f762340281e5fa012f9':
  Fix bug 4064086 Use a death handler on audio focus changes from mode
2011-03-09 10:20:24 -08:00
Jean-Michel Trivi
33ab4fc951 Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1 2011-03-09 10:18:31 -08:00
David Li
c95e452508 Merge "Added screenshot after glDraw* option to GLES2 Debugger" 2011-03-09 10:05:38 -08:00
David Li
c7ec152b9d Merge "Initial commit of GLESv2 debugger server" 2011-03-09 10:04:46 -08:00
Wink Saville
c740f330c0 Merge "Telephony: Corrections to LTE and eHRPD constant values." 2011-03-09 09:48:05 -08:00
Irfan Sheriff
85f50a626a am 86587185: am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1
* commit '865871850bcedd4b9da0536c8b41f3c1816e5f43':
  Persist wifi override in airplane mode
2011-03-09 09:36:40 -08:00
Irfan Sheriff
d99cd79768 am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1
* commit '7ad85eb62f9f332cc8002ec996cd359333ba590e':
  Persist wifi override in airplane mode
2011-03-09 09:32:55 -08:00
Irfan Sheriff
1d24d7f7ce Merge "Persist wifi override in airplane mode" into honeycomb-mr1 2011-03-09 09:30:28 -08:00
Patrick Scott
8dda66214f am 5d534f28: am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1
* commit '5d534f288d0c29337458e267fd207236bc23fec5':
  Pass the auto login header information to the app.
2011-03-09 05:10:34 -08:00
Patrick Scott
8ae27d926f am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1
* commit 'ea44c7c71431adbce348cf9ef3f22d9561bb7fc1':
  Pass the auto login header information to the app.
2011-03-09 05:08:15 -08:00
Patrick Scott
95d38acf8b Merge "Pass the auto login header information to the app." into honeycomb-mr1 2011-03-09 05:05:21 -08:00
Bjorn Bringert
1d47d4fe25 Merge "Exception handling clean-up in TextToSpeech.java" 2011-03-09 04:38:08 -08:00
Kristian Monsen
bfb7c4ba79 am b4ca8b76: am 9e697ee9: Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1
* commit 'b4ca8b7696ea8559fced8bcdf36e11ed28785c7c':
  Fix for bug 3469242 Turn of extra debugging before shipping
2011-03-09 04:34:31 -08:00
Kristian Monsen
d706d1eff0 am 9e697ee9: Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1
* commit '9e697ee9fc9dcc21348d799e1e0bc83dd3abdb18':
  Fix for bug 3469242 Turn of extra debugging before shipping
2011-03-09 04:32:28 -08:00
Kristian Monsen
8e947862d5 Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1 2011-03-09 04:29:45 -08:00
Mike Lockwood
d1d5ac154c am 093cf07f: am 9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* commit '093cf07f3c58a6553c415d750edba1a75b269f05':
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
2011-03-09 03:57:14 -08:00
Mike Lockwood
c92343ddde am 9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* commit '9e8e4ea0a839b561d329758cddbfd0f7ea23f593':
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
2011-03-09 03:54:28 -08:00
Mike Lockwood
298ecf5fdf Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* changes:
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
2011-03-09 03:52:47 -08:00
Jeff Brown
859364c2ca am 1baae5c9: (-s ours) am 36b077d5: Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1
* commit '1baae5c9b635f8672a8f0b8d83f23d5b9ec72297':
  Eliminate some accidental log spam.  (DO NOT MERGE)
2011-03-09 02:51:45 -08:00
Jeff Brown
8b0512713b am 36b077d5: Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1
* commit '36b077d558727ead246434b08de0ce7b955508e1':
  Eliminate some accidental log spam.  (DO NOT MERGE)
2011-03-09 02:48:18 -08:00
Jeff Brown
9caa9da162 Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 02:45:59 -08:00
Adam Powell
c986abfe12 am 529eb76b: am 12230eaa: Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1
* commit '529eb76b8add903c67ecf0178b6b4603edd64ebb':
  Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator
2011-03-09 00:28:29 -08:00
Adam Powell
d2c48f88ce am 12230eaa: Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1
* commit '12230eaa5f446cb22032d6645074a1aaca146df9':
  Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator
2011-03-09 00:25:10 -08:00
Adam Powell
eb4569e01f Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1 2011-03-09 00:22:53 -08:00
Romain Guy
78b0379822 am 3391435a: am 812dba1f: Merge "Prevents NPE when a View was detached Bug #4068284" into honeycomb-mr1
* commit '3391435afd7fa69e12cde17754e1d1f98f9d77e9':
  Prevents NPE when a View was detached Bug #4068284
2011-03-08 23:56:26 -08:00
Adam Powell
cccaecddc2 am 4763777e: am 1250c94b: Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1
* commit '4763777ebfa9d0d40ea7d117a351eaf96c5ac816':
  Bug 3509417 - Refine touch event serialization
2011-03-08 23:53:40 -08:00
Nicolas Roard
88737a7bd9 am acafb26d: am f986d496: Merge "Partial invalidation of the browser textures" into honeycomb-mr1
* commit 'acafb26d34963807fc8f4c1a46763c51821d194e':
  Partial invalidation of the browser textures
2011-03-08 23:53:26 -08:00
Romain Guy
61e29d0951 am 812dba1f: Merge "Prevents NPE when a View was detached Bug #4068284" into honeycomb-mr1
* commit '812dba1fcaa1a374124c2fe0694c1b4f21e3dea9':
  Prevents NPE when a View was detached Bug #4068284
2011-03-08 23:53:06 -08:00
Scott Main
b0286de557 am ae850caf: am 57e42c37: am b0355410: docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
* commit 'ae850caf9413db4b91a058f1d360e736140c7a9c':
  docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
2011-03-08 23:53:06 -08:00
Romain Guy
7dce7e09da Merge "Prevents NPE when a View was detached Bug #4068284" into honeycomb-mr1 2011-03-08 23:51:02 -08:00
Adam Powell
6ab86468be am 1250c94b: Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1
* commit '1250c94b50a3322e44c8ded7ab15bd6da9cc82a7':
  Bug 3509417 - Refine touch event serialization
2011-03-08 20:02:44 -08:00
Adam Powell
9b1a1eaa12 Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1 2011-03-08 20:00:25 -08:00
Carl Shapiro
109b57b1d8 Merge "Remove unused JNI global references." 2011-03-08 19:49:47 -08:00
Nicolas Roard
ba3af39374 am f986d496: Merge "Partial invalidation of the browser textures" into honeycomb-mr1
* commit 'f986d496c56fc8ae44b03f982e3e1ed437cdb996':
  Partial invalidation of the browser textures
2011-03-08 19:06:17 -08:00
Nicolas Roard
e0c413fbe7 Merge "Partial invalidation of the browser textures" into honeycomb-mr1 2011-03-08 19:02:33 -08:00