Siva Velusamy
93a826f78f
gltrace: transport buffering and context management
...
This patch adds two improvements:
1. Protobuf messages are buffered and sent in chunks.
2. Multiple EGL contexts are handled properly: Corresponding
to each EGLContext, a GLTraceContext with a unique ID is created.
On eglMakeCurrent, the appropriate GLTraceContext is set and is
used while tracing subsequent GL Calls in that thread.
Change-Id: I34076376d3e5af205c87c7396ea47659844abd6e
2012-01-04 11:38:37 -08:00
Siva Velusamy
59511ad1cb
Merge "gltrace: attach contents of the appropriate framebuffer"
2012-01-04 11:18:29 -08:00
John Reck
3b115238cf
Merge "Fix Apache stack"
2012-01-04 10:52:35 -08:00
Steve Block
7e2b7472a1
Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE"
2012-01-04 10:13:13 -08:00
Jesse Wilson
a91bc48fbd
Merge "Explicitly specify 'milliseconds' as alarm manager's time unit."
2012-01-04 08:22:36 -08:00
Steve Block
45c7256dcb
Merge "Fix AppCache when either no path or an invalid path is supplied"
2012-01-04 05:36:57 -08:00
Elliott Hughes
1145adc629
Merge "Fix Music import for Turkish locales."
2012-01-03 18:54:27 -08:00
Christopher Tate
675c98dafb
am 91582b86: am 30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1
...
* commit '91582b86d918b80158654671933cf26c96c34747':
Tweak docs on 'adb logcat'
2012-01-03 17:44:09 -08:00
Christopher Tate
48d485e150
am 30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1
...
* commit '30ad699c0e246ef3889f691361758235ecb89895':
Tweak docs on 'adb logcat'
2012-01-03 17:40:53 -08:00
Christopher Tate
1e2efa6270
Merge "Tweak docs on 'adb logcat'" into ics-mr1
2012-01-03 17:38:51 -08:00
Scott Main
8fd362ab56
am f65320a2: am 12d9954d: docs: dasboard update for 1/3/12
...
* commit 'f65320a2743e81ae1cb62f2dbf60b65a122b9ddb':
docs: dasboard update for 1/3/12
2012-01-03 16:00:28 -08:00
Scott Main
ec6532faf3
am 12d9954d: docs: dasboard update for 1/3/12
...
* commit '12d9954d198d29da1a15ba2c6947ce91839cbb83':
docs: dasboard update for 1/3/12
2012-01-03 15:58:41 -08:00
Steve Block
9d45368352
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
2012-01-03 22:38:27 +00:00
Romain Guy
7aa67d5ba2
Merge "Properly restore the GL scissor after a GL draw functor Bug #5781254 "
2012-01-03 14:21:18 -08:00
Danielle Millett
23365b88fd
Merge "Fix 5783857: Device Policy Manager doesn't allow Face Unlock"
2012-01-03 13:44:28 -08:00
Brian Colonna
1cad42d5b7
Merge "Added padding to PIN layout status and carrier text"
2012-01-03 13:43:07 -08:00
Brian Colonna
5a051a3f1f
Merge "Unbinding from FU when going to backup"
2012-01-03 13:42:17 -08:00
Jeff Sharkey
8709bf71af
Merge "Test the correct return code from call to cryptfs."
2012-01-03 10:57:19 -08:00
Dirk Dougherty
611d9bf369
am 27d2a07a: am a17e100b: Doc change: fix link target for "Publish" icon.
...
* commit '27d2a07a5548e238863135280b706751764ef20f':
Doc change: fix link target for "Publish" icon.
2012-01-03 10:37:48 -08:00
Dirk Dougherty
c1140c41a5
am a17e100b: Doc change: fix link target for "Publish" icon.
...
* commit 'a17e100b7a192cae3935d2ae144fb1a1115a4ca7':
Doc change: fix link target for "Publish" icon.
2012-01-03 10:35:18 -08:00
Ben Murdoch
ecaf1dc174
Merge "Do not allow file:// access when it is disabled."
2012-01-03 02:53:58 -08:00
Wink Saville
8b96a47849
Merge "Separate SIM states from Radio states"
2011-12-29 16:41:09 -08:00
Eric Fischer
6729420350
Merge "Import revised translations."
2011-12-29 14:46:50 -08:00
Irfan Sheriff
97287ea0d8
Merge "Add multi-interface support to native calls"
2011-12-29 09:11:29 -08:00
Chia-chi Yeh
6ffe2dc54a
Merge "SipService: grab Wi-Fi lock only when necessary."
2011-12-28 15:14:23 -08:00
Irfan Sheriff
84dbfc6324
Merge "clean up jni code"
2011-12-28 13:55:19 -08:00
Scott Main
1a661aedb3
am e231cd0a: am 0582da68: docs: add links for Galaxy Nexus driver
...
* commit 'e231cd0a0dd5fce60a0635d7a60233db432429dd':
docs: add links for Galaxy Nexus driver
2011-12-28 10:36:01 -08:00
Scott Main
0b59e0cdb5
am 0582da68: docs: add links for Galaxy Nexus driver
...
* commit '0582da680ed3d48bfd9d6ed550f39aa2177baf79':
docs: add links for Galaxy Nexus driver
2011-12-28 10:34:03 -08:00
Jesse Wilson
dd041f94b2
Merge "Move the frameworks/base hostname verifier into libcore. Part 2/2"
2011-12-27 16:42:24 -08:00
Joe Fernandez
2c35389f7a
am 201469f5: am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
...
* commit '201469f54522436be79d4d6665721049bfc74320':
docs: Add developer guide cross-references, Project ACRE, round 4
2011-12-22 15:59:34 -08:00
Joe Fernandez
c79adf24cb
am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
...
* commit 'bb7f590a5a539486de5127071c7ade8ec988d755':
docs: Add developer guide cross-references, Project ACRE, round 4
2011-12-22 15:57:09 -08:00
Joe Fernandez
5c907fd862
Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
2011-12-22 15:55:00 -08:00
Eric Laurent
9b41f16a1f
Merge "AudioService: simplified handler messages."
2011-12-22 15:54:38 -08:00
Robert Greenwalt
45de80cd66
Merge "Use shared connections over retries."
2011-12-22 14:43:28 -08:00
Roman Nurik
4d2a5c1f63
am 38daf3f1: am 38ee0dae: Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
...
* commit '38daf3f122ac48b20d48779322ffc1a0fb9a3eb9':
docs: Update App Widgets dev guide size discussion
2011-12-22 14:31:33 -08:00
Roman Nurik
aac4f449cc
am 38ee0dae: Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
...
* commit '38ee0dae2cf0ff1860973523e5cda6e38642e904':
docs: Update App Widgets dev guide size discussion
2011-12-22 14:29:25 -08:00
Roman Nurik
3cae86d9e1
Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
2011-12-22 14:27:55 -08:00
Jonathan Dixon
cf348aaaa0
Merge "Fix silly comment order error"
2011-12-22 06:30:50 -08:00
Irfan Sheriff
f0dc654521
Merge "p2p fixes"
2011-12-21 09:26:36 -08:00
Chet Haase
f77ccc3309
Merge "Fix behavior of AnimationSet and fillBefore"
2011-12-21 07:53:14 -08:00
The Android Open Source Project
0f04cd6044
am 7e4aa24c: Reconcile with ics-mr1-release
...
* commit '7e4aa24c8701381f542a324df958907194285fdc':
2011-12-21 07:21:45 -08:00
The Android Open Source Project
debdcaec3d
Reconcile with ics-mr1-release
...
Change-Id: Ic9251f762e0356c65eff1798cd5897a502d7981e
2011-12-21 07:19:20 -08:00
The Android Automerger
100786e8a5
merge in ics-mr1-release history after reset to ics-mr1
2011-12-20 17:27:07 -08:00
The Android Open Source Project
22a4c1c006
am 21cb1290: Reconcile with ics-mr1-release
...
* commit '21cb1290b578a4bceac003c276c00911fcd6c9d4':
2011-12-20 13:11:53 -08:00
The Android Open Source Project
2e2c59f4c6
Reconcile with ics-mr1-release
...
Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78
2011-12-20 13:08:33 -08:00
Chet Haase
41338ae6ad
Merge "Make behavior of ABSOLUTE pivot values more intuitive"
2011-12-20 10:49:02 -08:00
Gilles Debunne
d2c5a3cf15
Merge "Rationalize blinking cursor test."
2011-12-20 10:46:42 -08:00
John Wang
80d317727c
am c0139281: am c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
...
* commit 'c01392816fbb16ca76c738bc801f3b2c34548c06':
Hide emergency call text if not support it.
2011-12-20 10:45:32 -08:00
John Wang
898459a57b
am c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
...
* commit 'c892e177c4f7a41e910c70f68d4e213589da1396':
Hide emergency call text if not support it.
2011-12-20 10:43:13 -08:00
John Wang
6e52b21f09
Merge "Hide emergency call text if not support it." into ics-mr1
2011-12-20 10:41:08 -08:00