drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,057 Commits 1 Branch 0 Tags
Commit Graph

64057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Siva Velusamy
1e81e710fc 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
efc1265402 Merge "gltrace: attach contents of the appropriate framebuffer" 2012-01-04 11:18:29 -08:00
John Reck
c9c76a82c6 Merge "Fix Apache stack" 2012-01-04 10:52:35 -08:00
Steve Block
41891aeaf4 Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE" 2012-01-04 10:13:13 -08:00
John Reck
430b1b9b3c Fix Apache stack 
Change-Id: Iec7d0d8bdaaa5594fa7412db79943ab0ccdf594c
 2012-01-04 09:49:17 -08:00
Jesse Wilson
7c48707a9d Merge "Explicitly specify 'milliseconds' as alarm manager's time unit." 2012-01-04 08:22:36 -08:00
Steve Block
7b061309fa Merge "Fix AppCache when either no path or an invalid path is supplied" 2012-01-04 05:36:57 -08:00
Elliott Hughes
b4f7bbc57c Merge "Fix Music import for Turkish locales." 2012-01-03 18:54:27 -08:00
Christopher Tate
20eaf4c1a4 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
91582b86d9 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
30ad699c0e Merge "Tweak docs on 'adb logcat'" into ics-mr1 2012-01-03 17:38:51 -08:00
Elliott Hughes
6746499f12 Fix Music import for Turkish locales. 
For non-localized strings like the keywords in SQL statements, we shouldn't use
locale-specific case transformations.

(Cherry pick of 03f8f84c345e7c861a6de889d434b9d82cf04c8d.)

Bug: 4284951
Change-Id: Ib5180daf7892af7b645c906fdfeacf9da87bd667
 2012-01-03 17:20:38 -08:00
Christopher Tate
1df51c65ea Tweak docs on 'adb logcat' 
* Add description of 'threadtime' output format
* Remove description of highly-confusing and never-used 'thread' output format
* Adjust language slightly

Change-Id: I2dcc8b7e5e8c039659697e90d7a4b3746b9135e9
 2012-01-03 16:50:50 -08:00
Scott Main
1ad47b47bc 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
f65320a274 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
Scott Main
12d9954d19 docs: dasboard update for 1/3/12 
Change-Id: Ie584d9ee238b6d4a37c25dd7e30b0cf493cbfe47
 2012-01-03 15:45:00 -08:00
Steve Block
5baa3a62a9 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
173ab4d610 Merge "Properly restore the GL scissor after a GL draw functor Bug #5781254" 2012-01-03 14:21:18 -08:00
Romain Guy
82bc7a7727 Properly restore the GL scissor after a GL draw functor 
Bug #5781254

Change-Id: I1dc4809563a793b6b579814951d4d73b4c34bf32
 2012-01-03 14:14:55 -08:00
Danielle Millett
3c673732ea Merge "Fix 5783857: Device Policy Manager doesn't allow Face Unlock" 2012-01-03 13:44:28 -08:00
Brian Colonna
dd13756fdc Merge "Added padding to PIN layout status and carrier text" 2012-01-03 13:43:07 -08:00
Brian Colonna
edcac2aa69 Merge "Unbinding from FU when going to backup" 2012-01-03 13:42:17 -08:00
Jeff Sharkey
b8f90a0e6e Merge "Test the correct return code from call to cryptfs." 2012-01-03 10:57:19 -08:00
Dirk Dougherty
478e45be57 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
27d2a07a55 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
Dirk Dougherty
a17e100b7a Doc change: fix link target for "Publish" icon. 
Change-Id: Iafc8db7e9ad7c42e5e2a1eaed2fb5b93a53e56f9
 2012-01-03 10:09:29 -08:00
Ben Murdoch
2853041e6a Merge "Do not allow file:// access when it is disabled." 2012-01-03 02:53:58 -08:00
Wink Saville
e7f2cafc17 Merge "Separate SIM states from Radio states" 2011-12-29 16:41:09 -08:00
Naveen Kalla
fc2cbe9b46 Separate SIM states from Radio states 
Radio state reflects the state of the modem. SIM_READY, RUIM_READY,
NV_READY are subscription states and it is possible that the new cards
have multiple subscriptions. Remove the SIM states from Radio State and
introduce a new VOICE_RADIO_TECH message to identify the exact voice
technology. SIM states will continue to be identified from the
SIM_STATUS messages.

Change-Id: Ia67d54f43b6c3340d9cf5c27fcb6f7ef49ef4d40
 2011-12-29 15:08:20 -08:00
Eric Fischer
40da0486f8 Merge "Import revised translations." 2011-12-29 14:46:50 -08:00
Eric Fischer
6f32f87717 Import revised translations. 
Change-Id: Idaec3a909e2edb46d7f3409947c8329210befcae
 2011-12-29 11:46:43 -08:00
Irfan Sheriff
7db0d04112 Merge "Add multi-interface support to native calls" 2011-12-29 09:11:29 -08:00
Chia-chi Yeh
a650639d5b Merge "SipService: grab Wi-Fi lock only when necessary." 2011-12-28 15:14:23 -08:00
Chia-chi Yeh
c2bd6162ed SipService: grab Wi-Fi lock only when necessary. 
Change-Id: Ie432049156e70b6748426b959b653f21bfc504a1
 2011-12-28 15:11:04 -08:00
Irfan Sheriff
2f0d941b5d Merge "clean up jni code" 2011-12-28 13:55:19 -08:00
Irfan Sheriff
44b330dfb0 Add multi-interface support to native calls 
Add the initial support for supporting seperate socket
connections on the p2p interface.

This is the initial change making primary interface connections
work alongside native support for p2p socket connection

Change-Id: I7619715ca75b10afd29af852279fe713331f75e0
 2011-12-28 13:25:14 -08:00
Irfan Sheriff
1f09586953 clean up jni code 
- Move all supplicant commands out of jni code in preparation for multi-socket
changes

- Also, clean up some function names to remove the explicit command

Change-Id: Id609ac7df0792fb85b52554d159f22064227c584
 2011-12-28 13:18:07 -08:00
Scott Main
085ab36cc9 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
e231cd0a0d 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
2ae509b58a Merge "Move the frameworks/base hostname verifier into libcore. Part 2/2" 2011-12-27 16:42:24 -08:00
Jesse Wilson
52cd299eef Move the frameworks/base hostname verifier into libcore. Part 2/2 
Bug: http://b/5619726
Change-Id: I165eb3befcef104ff56ffb466c87c60b632f3194
 2011-12-27 19:00:56 -05:00
Scott Main
0582da680e docs: add links for Galaxy Nexus driver 
Change-Id: Iae875f70049f3b4561783e66e264eac802e8ae19
 2011-12-27 15:52:11 -08:00
Chia-chi Yeh
c1bac3a6e2 VPN: fix a CloseGuard warning. 
Change-Id: Ic237a33038be9a170c1f9128332a8743c57971ed
 2011-12-27 13:14:51 -08:00
Jesse Wilson
79074cd935 Explicitly specify 'milliseconds' as alarm manager's time unit. 
Change-Id: Ic247c1a17283f7b1aa51cae8a2b43e987208aa8a
 2011-12-22 22:51:37 -05:00
Joe Fernandez
2b07267753 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
201469f545 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
bb7f590a5a Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1 2011-12-22 15:55:00 -08:00
Eric Laurent
2bd0d74a58 Merge "AudioService: simplified handler messages." 2011-12-22 15:54:38 -08:00
Joe Fernandez
3aef8e1d1b docs: Add developer guide cross-references, Project ACRE, round 4 
Change-Id: I1b43414aaec8ea217b39a0d780c80a25409d0991
 2011-12-22 15:08:23 -08:00
Robert Greenwalt
dcd30c8f69 Merge "Use shared connections over retries." 2011-12-22 14:43:28 -08:00