ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity
42,675 Commits 2 Branches 0 Tags 54 MiB
7c12106db8
Commit Graph

42675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bart Sears
77f0a7535d am 875b6992: (-s ours) am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 
* commit '875b69928193e464243cf491bfe861f30644e9b4':
  Do not allow file:// access when it is disabled. Do not merge.
 2012-01-04 21:52:04 -08:00
Eric Laurent
e9e2f6f78a resolved conflicts for merge of 1a4b9939 to master 
Change-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2
 2012-01-04 17:39:12 -08:00
The Android Automerger
31815b4f39 merge in ics-mr1-release history after reset to ics-mr1 2012-01-04 16:42:23 -08:00
Wink Saville
42fdc6f3e3 am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1 
* commit 'c697ebfdd671c7f4cf338d601917de16d2f1f135':
  Enhancement on ICS data stall polling logic
 2012-01-04 13:55:28 -08:00
Wink Saville
103a6ff9ce Merge "Enhancement on ICS data stall polling logic" into ics-mr1 2012-01-04 13:53:25 -08:00
Wink Saville
0d69bb8a62 am d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 
* commit 'd4d35168129d544f62cee7e1f83c5bf15d9f291d':
  Add support of dislaying Alpha tag for BIP commands
 2012-01-04 13:51:59 -08:00
Wink Saville
4ee6427cc5 Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 2012-01-04 13:50:04 -08:00
Wink Saville
5bdd1e8ccf am c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 
* commit 'c97d0e43bacdae735071d6d7026175fbc4bdafca':
  Support suggestedRetryTime in CDMA DCT
 2012-01-04 13:49:37 -08:00
Bart Sears
53cc3c7676 am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 
* commit '705665acda5fec6c8c76683b2e5850b0bd447449':
  Do not allow file:// access when it is disabled. Do not merge.
 2012-01-04 13:49:34 -08:00
Wink Saville
624eef24dc Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 2012-01-04 13:47:55 -08:00
Bart Sears
66577b602c Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 2012-01-04 13:47:09 -08:00
Eric Laurent
2ae141d964 am fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 
* commit 'fb578b6b88af51812b71a86ad4dd3a7de56e394b':
  audioflinger: fix clicks on 48kHz audio.
 2012-01-04 13:00:49 -08:00
Eric Laurent
11cb4c04a3 Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 2012-01-04 12:58:17 -08:00
Siva Velusamy
3f194e6e3a gltrace: add user settings to control data captured. 
Currently users do not have control over the amount of data
captured during tracing. This patch adds 3 settings that users
can enable/disable at runtime:
  - capture framebuffer on eglSwap() calls
  - capture framebuffer on glDraw*() calls
  - capture texture data passed to glTexImage*() calls
Disabling these options when not needed signficantly decreases
the size of the trace file, and reduces performance overhead for
the running application.

These settings are stored in the per process GLTraceState.
A separate thread listens for commands from the host, and updates
the state based on the user commands.

Change-Id: Ic4518b94e8bcbc5330ac7138153721caa98b365d
 2012-01-04 12:50:13 -08:00
Siva Velusamy
875bdea8be Merge "gltrace: add start time & duration to each traced call." 2012-01-04 12:48:52 -08:00
Siva Velusamy
9fccbcf891 Merge "gltrace: transport buffering and context management" 2012-01-04 12:47:29 -08:00
Steve Block
a19954ab37 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
 2012-01-04 20:05:49 +00:00
Scott Main
11468cd7dd am 319c3bcb: am c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url 
* commit '319c3bcbb1b0163040984e263b5b16005f81adba':
  docs: add Teleepoch VID/driver info and update Huawei url
 2012-01-04 12:03:22 -08:00
Scott Main
030270348b am c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url 
* commit 'c8810c2feb53bd423d0ef31bc10d22fc4cbf9c89':
  docs: add Teleepoch VID/driver info and update Huawei url
 2012-01-04 12:01:02 -08:00
Siva Velusamy
56ac6ff9bd gltrace: add start time & duration to each traced call. 
Change-Id: Idfec8f715f6000594b6381cbfdee9fdf6d89f484
 2012-01-04 11:38:37 -08:00
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