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

65086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
efd617e01f am 0ad96f89: am d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 
* commit '0ad96f89401920486b68d8404f6a143870d57500':
  Add support of dislaying Alpha tag for BIP commands
 2012-01-04 21:52:10 -08:00
Wink Saville
7da207b574 am a3534ad4: am c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 
* commit 'a3534ad4a4b936a2629f4a0b854b814b3494ac7e':
  Support suggestedRetryTime in CDMA DCT
 2012-01-04 21:52:06 -08:00
Bart Sears
39f0554098 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
27675133f4 am dc8627e7: resolved conflicts for merge of 1a4b9939 to master 
* commit 'dc8627e7dcd019ec328878b1f7855890d39ed0ab':
  audioflinger: fix clicks on 48kHz audio.
 2012-01-04 17:47:37 -08:00
Eric Laurent
dc8627e7dc resolved conflicts for merge of 1a4b9939 to master 
Change-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2
 2012-01-04 17:39:12 -08:00
Teng-Hui Zhu
0d1d30b330 getDuration can be only called after prepared. 
bug:5816130
Change-Id: I4f264ef612995bc4f7bc3e378893ed9491423fdc
 2012-01-04 17:28:58 -08:00
Scott Main
e63163a334 docs: second set of diagram updates 
Change-Id: I1df85b6a954c29344d537737da57683b2c7941fd
 2012-01-04 17:20:48 -08:00
Alex Sakhartchouk
6b908df7d9 Merge "Adding better error behavior to RS" into graphics-dev 2012-01-04 16:59:41 -08:00
Alex Sakhartchouk
afdf7be7ce Merge "Adding RS comments, cleaning up the gl implementation with new Element hal." into graphics-dev 2012-01-04 16:59:16 -08:00
The Android Automerger
6590d88f65 merge in ics-mr1-release history after reset to ics-mr1 2012-01-04 16:42:23 -08:00
Fabrice Di Meglio
bd7cdc32eb Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long 
- do not clear the smart pointer when the cache entry does not fit the cache size

Change-Id: I49f1aa1e70018bb7d6a8fb076d9269d0ec6a5d98
See: http://code.google.com/p/android/issues/detail?id=23337
 2012-01-04 14:25:54 -08:00
Wink Saville
3ed2803691 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
c697ebfdd6 Merge "Enhancement on ICS data stall polling logic" into ics-mr1 2012-01-04 13:53:25 -08:00
Wink Saville
0ad96f8940 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
d4d3516812 Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 2012-01-04 13:50:04 -08:00
Wink Saville
a3534ad4a4 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
875b699281 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
c97d0e43ba Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 2012-01-04 13:47:55 -08:00
Bart Sears
705665acda 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
1a4b99396d 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
fb578b6b88 Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 2012-01-04 12:58:17 -08:00
Siva Velusamy
e6412cdc9f am 157fea64: gltrace: add user settings to control data captured. 
* commit '157fea642cb4c10e44a61f932c68f7c3a2610a81':
  gltrace: add user settings to control data captured.
 2012-01-04 12:54:20 -08:00
Siva Velusamy
5bd064a7b4 am 193b4597: Merge "gltrace: add start time & duration to each traced call." 
* commit '193b45970e512e99b4557fe4bbb30b2dca30320f':
  gltrace: add start time & duration to each traced call.
 2012-01-04 12:52:02 -08:00
Siva Velusamy
157fea642c 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
8ebeebd4f5 am 974a1660: Merge "gltrace: transport buffering and context management" 
* commit '974a166022a67bd4e808bb788d44f5cc84039332':
  gltrace: transport buffering and context management
 2012-01-04 12:49:46 -08:00
Siva Velusamy
193b45970e Merge "gltrace: add start time & duration to each traced call." 2012-01-04 12:48:52 -08:00
Siva Velusamy
974a166022 Merge "gltrace: transport buffering and context management" 2012-01-04 12:47:29 -08:00
Steve Block
6215d3ff4b 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
939c0aa0af am 16a21720: am 319c3bcb: am c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url 
* commit '16a21720d904f7078e0375d517869b336a019069':
  docs: add Teleepoch VID/driver info and update Huawei url
 2012-01-04 12:05:33 -08:00
Scott Main
16a21720d9 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
319c3bcbb1 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
Scott Main
c8810c2feb docs: add Teleepoch VID/driver info 
and update Huawei url

Change-Id: I4d6720d132f0d4e53bb25aa225327e38ba969881
 2012-01-04 11:57:18 -08:00
Siva Velusamy
5ed919e33d gltrace: add start time & duration to each traced call. 
Change-Id: Idfec8f715f6000594b6381cbfdee9fdf6d89f484
 2012-01-04 11:38:37 -08:00
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
70680c9b1a am efc12654: Merge "gltrace: attach contents of the appropriate framebuffer" 
* commit 'efc1265402512303a9cf88b7ddd796e92df7857b':
  gltrace: attach contents of the appropriate framebuffer
 2012-01-04 11:20:54 -08:00
Siva Velusamy
efc1265402 Merge "gltrace: attach contents of the appropriate framebuffer" 2012-01-04 11:18:29 -08:00
Kazuhiro Ondo
7efb89b955 Enhancement on ICS data stall polling logic 
Put enhancements on data stall polling logic in ICS so that
stall recovery can kick in earler while screen is on.

Bug: 5767897
Change-Id: I4683fc45c0161f4374749c8e5840261c19a48f77
 2012-01-04 11:09:51 -08:00
John Reck
7d2a75694b am c9c76a82: Merge "Fix Apache stack" 
* commit 'c9c76a82c6d0bf2362044d899013832882f32c94':
  Fix Apache stack
 2012-01-04 10:53:56 -08:00
John Reck
c9c76a82c6 Merge "Fix Apache stack" 2012-01-04 10:52:35 -08:00
Steve Block
c2daafc18d am 41891aea: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE" 
* commit '41891aeaf4e6e4006ae3087fa537786e9ec8caa4':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)  DO NOT MERGE
 2012-01-04 10:16:14 -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
Alex Sakhartchouk
875a538d5d Adding light script to scenegraph. 
Patching up the collada parser to handle data from different converters.

Change-Id: Ibac4d3cd8e7af65b67ad3ad5023e26af075a20bb
 2012-01-04 09:46:50 -08:00
Jesse Wilson
3d95c1b24e am 7c48707a: Merge "Explicitly specify \'milliseconds\' as alarm manager\'s time unit." 
* commit '7c48707a9d320230452d5937239f28ab0ea2e695':
  Explicitly specify 'milliseconds' as alarm manager's time unit.
 2012-01-04 08:24:40 -08:00
Jesse Wilson
7c48707a9d Merge "Explicitly specify 'milliseconds' as alarm manager's time unit." 2012-01-04 08:22:36 -08:00
Ben Murdoch
b2c63abcdc Do not allow file:// access when it is disabled. Do not merge. 
Cherry pick of If2793f31cb37e0d3af15cb18e818bfa4058167fd

If WebSettings is configured to disallow access to file://
URLs, then block them.

Bug: 5773763
Change-Id: I0ab84cde90c955d31077329fddebc25978287c64
 2012-01-04 15:08:07 +00:00
Steve Block
506fb9fa0b am 7b061309: Merge "Fix AppCache when either no path or an invalid path is supplied" 
* commit '7b061309fabb6fdf9e40a48dd4feaac6ffa29710':
  Fix AppCache when either no path or an invalid path is supplied
 2012-01-04 05:39:13 -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
0ba35df329 am b4f7bbc5: Merge "Fix Music import for Turkish locales." 
* commit 'b4f7bbc57c17375a75e5128ae84842b38b550c46':
  Fix Music import for Turkish locales.
 2012-01-03 18:55:49 -08:00
Elliott Hughes
b4f7bbc57c Merge "Fix Music import for Turkish locales." 2012-01-03 18:54:27 -08:00