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

64085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
c60aad2a8a Write unit tests for android.speech.tts. 
Change-Id: Ie5b3b4cdd13be2babee9a44bae00da179b372d12
 2012-01-09 13:38:55 +00:00
Wink Saville
9a03482c66 am 3ed28036: am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1 
* commit '3ed2803691cc271fe6b893dc46d49fca2fce61df':
  Enhancement on ICS data stall polling logic
 2012-01-04 21:52:13 -08:00
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
dc8627e7dc resolved conflicts for merge of 1a4b9939 to master 
Change-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2
 2012-01-04 17:39:12 -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
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
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
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
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
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
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
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
Wink Saville
81fa7f305b Add support of dislaying Alpha tag for BIP commands 
While BIP data call setup is still handled in RIL/Modem,
this patch is adding support of Alpha tag display on UI.
Alpha tag is optionally included in "OPEN Channel", "Close Channel",
"Send Data" or "Receive Data" command.

"Open channel" will be notified via RIL_UNSOL_STK_PROACTIVE_COMMAND
which requires TERMINAL RESPONSE based on user input.
"Close channel", "Send Data" and "Receive Data" commands
are send via RIL_UNSOL_STK_EVENT_NOTIFY just to display
transient notice.

Bug:5165510
Change-Id: I873e55274c860886bc816ce6fb07cb882d339214
 2012-01-03 15:06:15 -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