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
Andreas Huber
f6b4ca408e Slighly improve the API to discover if the OMX stack is running in the local 
process.

Change-Id: Idd3c2f0d4a9542af01a3fdfd3b0bfab90e083505
 2012-01-31 11:16:24 -08:00
Andreas Huber
0056c739c5 Merge "Make sure our aac decoder handles this parameter." 2012-01-31 08:31:03 -08:00
Wink Saville
cec507f235 Merge "Display roaming indicator icon only based on ERI in CDMA case." 2012-01-31 06:39:52 -08:00
Ben Murdoch
145b340773 Merge "Remove code that quits the webcore watchdog thread." 2012-01-31 02:17:12 -08:00
Mathias Agopian
9eb95992ea fix a race condition in eglMakeCurrent() 
it would happen when a context was made non-current, in this
case we would call the implementation's eglMakeCurrent() which
would succeed, if we're rescheduled at that point, another
eglMakeCurrent() could make that context current to another thread,
however, when we came back to the original call we would
overwrite egl_context_t internal state.

this is fixed by moving the critical section under
egl_display_t's lock.

Change-Id: I743c85696e13263d3a9570824940263df0caacdc
 2012-01-30 18:20:52 -08:00
Mathias Agopian
11c5db5e29 Merge "add all needed GL extension wrappers" 2012-01-30 17:44:09 -08:00
Romain Guy
1e56fff3b9 Merge "Add debug markers to OpenGLRenderer" 2012-01-30 17:43:37 -08:00
Romain Guy
13631f3da8 Add debug markers to OpenGLRenderer 
These markers will be used to group the GL commands by View in the
OpenGL ES debugging tool. This will help correlate individual GL
calls to higher level components like Views.

Change-Id: I73607ba2e7224a80ac32527968261ee008f049c6
 2012-01-30 17:41:55 -08:00
Mathias Agopian
d0393a9e18 add all needed GL extension wrappers 
when increasing MAX_NUMBER_OF_GL_EXTENSIONS to 256
we also needed to create all the corresponding wrappers.

Change-Id: I90edaaf0885ccdfab48e7a1396bcf88e039cfb25
 2012-01-30 17:40:29 -08:00
Gilles Debunne
79e3e5f5d4 Merge "Removed SoftInputShownOnFocus methods in TextView" 2012-01-30 17:01:19 -08:00
Andreas Huber
4882355d8c Make sure our aac decoder handles this parameter. 
Change-Id: I212ef0c21776b99d0c6662b118ca0ec16b1d3d5e
 2012-01-30 16:45:28 -08:00
Svetoslav Ganov
12df3cf156 Merge "Incorrect behavior of View clear focus." 2012-01-30 16:37:33 -08:00
Scott Main
f68af846d4 am 6e4f886d: am b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1 
* commit '6e4f886db034b954a305611cc71a10ff7d1c75ae':
  docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results
 2012-01-30 16:18:54 -08:00
Scott Main
6e4f886db0 am b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1 
* commit 'b2d37b39a1bb48d9f9c5b45255c5df769b85d6ae':
  docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results
 2012-01-30 16:15:29 -08:00
Scott Main
b2d37b39a1 Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1 2012-01-30 16:13:28 -08:00
Scott Main
275345b087 am a76ddf92: am 6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit 
* commit 'a76ddf927278ec36f5a4589dbba85bb06bb1ae19':
  docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
 2012-01-30 15:28:36 -08:00
Scott Main
a21ac88b10 docs: update sidenav to use <span> instead of <h2> for headings, 
under suspicion that the h2s are causing poor snippet extraction in search results

Change-Id: I35f414fbb104984408b087db1366535cb18d4718
 2012-01-30 15:27:37 -08:00
Mathias Agopian
7ff542c1ae Merge "SF now synchronizes to VSYNC" 2012-01-30 15:24:46 -08:00
Eric Fischer
478485678a Merge "Import translations. DO NOT MERGE" 2012-01-30 15:24:41 -08:00
Mathias Agopian
818b423658 Merge "add support for GL_EXT_debug_marker" 2012-01-30 15:23:47 -08:00
Mathias Agopian
e02f7b3fa8 SF now synchronizes to VSYNC 
Change-Id: Ic5e4f2ea9927ce133eef9499c03161325e9d02c5
 2012-01-30 15:21:23 -08:00
Eric Fischer
b61712bde1 Import translations. DO NOT MERGE 
Change-Id: I2395f99e947c1b75df55216e9b0246eac63f0d8f
 2012-01-30 15:21:00 -08:00
Scott Main
a76ddf9272 am 6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit 
* commit '6507df8b78d80403d66d321748ad47290a611e3f':
  docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
 2012-01-30 15:14:53 -08:00
Gilles Debunne
e62beb5c20 Removed SoftInputShownOnFocus methods in TextView 
Not used by Phone, for which it was initially created.

Change-Id: I0cad668f894e88cda0a410005aaf6b6c0b89dc3e
 2012-01-30 15:10:41 -08:00
Romain Guy
a585e8dbcf Merge "Always initialize AsyncTask on the main thread." 2012-01-30 14:12:37 -08:00
Romain Guy
5e9120d4ad Always initialize AsyncTask on the main thread. 
Change-Id: I039e5d6cb7157a0c8873e0d29161daf1cbda5577
 2012-01-30 14:11:44 -08:00
Scott Main
6507df8b78 docs: add meta descriptions for home and sdk 
also revise the G+ widget to make fit

Change-Id: Iadc8858bec2524fa9ed905534949885c7130ccc2
 2012-01-30 14:04:22 -08:00
Kazuhiro Ondo
bc92613cf7 Display roaming indicator icon only based on ERI in CDMA case. 
Fixing CV failure. In some scenario where ERI table expects
"Roaming Indicator OFF", R icon was still displayed on
the status bar. This patch is to update the logic so that
only ERI table is used to display R icon in case of CDMA.

Bug:5932154
Change-Id: I125087cc8d700b102e05c3050d88a70485c9a86e
 2012-01-30 13:42:21 -08:00
The Android Open Source Project
c7d7515325 am 827a597d: Reconcile with ics-mr1-release 
* commit '827a597df70a51c6cccad52fae2be2c469f58b77':
  Revert "Fix 5797764: Increase lock screen's thread priority"
  DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
 2012-01-30 13:38:52 -08:00
The Android Open Source Project
827a597df7 Reconcile with ics-mr1-release 
Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2
 2012-01-30 13:36:34 -08:00
The Android Automerger
10d6e70a1b merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 13:23:32 -08:00
Gilles Debunne
a821733059 Merge "Remove onPreDrawListeners earlier in TextView" 2012-01-30 12:58:53 -08:00
Dianne Hackborn
a69894846c am 25fe8ef1: am e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1 
* commit '25fe8ef1b51b4a36e08b3fea35c0799f3d0840e2':
  Update documentation to reflect the old approach not working.
 2012-01-30 12:56:42 -08:00
Dianne Hackborn
25fe8ef1b5 am e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1 
* commit 'e22f4748565915948c8af2961ac74fe81a417e3b':
  Update documentation to reflect the old approach not working.
 2012-01-30 12:54:02 -08:00
Dianne Hackborn
e22f474856 Merge "Update documentation to reflect the old approach not working." into ics-mr1 2012-01-30 12:52:11 -08:00
Andreas Huber
e372593cfb Merge "Instantiate software codecs locally whenever possible." 2012-01-30 12:32:58 -08:00
Stephen Hines
855eadf942 Merge "Fix potential bug with reordered size/offset arguments." 2012-01-30 12:22:10 -08:00
Romain Guy
69726597b3 Merge "Add stencil buffer to the EGL config" 2012-01-30 12:05:28 -08:00
Romain Guy
530041d319 Add stencil buffer to the EGL config 
Change-Id: If76c0cd6127534d90f9526b75c0f8e56259c6722
 2012-01-30 12:04:17 -08:00
Ben Murdoch
b5622b6008 Remove code that quits the webcore watchdog thread. 
The WebCore thread lives forever ergo so should the
watchdog.

Bug: 5920210
Change-Id: I2596a4cc4720c4e09265b9a875680bb7891bd919
 2012-01-30 20:01:41 +00:00
Jeff Sharkey
4d6da8649a Merge "Move away from deprecated NetworkInfo extra." 2012-01-30 11:53:32 -08:00
Andreas Huber
18ffe40289 Instantiate software codecs locally whenever possible. 
Change-Id: I58d5c30b9de9873a239e91955a8900e2c72518a7
 2012-01-30 11:48:02 -08:00
Dianne Hackborn
fa9b5cae64 Update documentation to reflect the old approach not working. 
The old approach has a problem with the original application's
recent tasks entry disappearing (this is probably a bug in the
platform).  Update to an alternative approach that does work.

Change-Id: I15e582eff8c77cc22628f7b099e9f04eb5bfbce7
 2012-01-30 11:45:00 -08:00
John Wang
7a41c7013d am 136704a8: am b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1 
* commit '136704a803ed7dd419a452315d1c0fe4885ce441':
  Adjust the LTE signal bar mapping.
 2012-01-30 11:25:48 -08:00
John Wang
136704a803 am b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1 
* commit 'b069833e63f711a6b140385003d67b3ff68fe66b':
  Adjust the LTE signal bar mapping.
 2012-01-30 11:23:24 -08:00
Jeff Sharkey
5e61331da5 Move away from deprecated NetworkInfo extra. 
Because the NetworkInfo included in CONNECTIVITY_ACTION broadcast
extra does not reflect the state applicable to the calling UID, and
the last sticky broadcast may have stale state, transition to calling
ConnectivityManager.getActiveNetworkInfo() directly.

Change-Id: I86b316fbedd0273585ad5f1248b091bc3a3a5520
 2012-01-30 11:21:35 -08:00
John Wang
b069833e63 Merge "Adjust the LTE signal bar mapping." into ics-mr1 2012-01-30 11:20:35 -08:00
Makoto Onuki
d53da8efa7 Merge "Fixing broken unittests." 2012-01-30 11:16:58 -08:00
Scott Main
f10d69f301 am fb300fb2: am 73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1 
* commit 'fb300fb2f0f253c94c14090256f9695bca1a1e4b':
  docs: add G+ page announcement to homepage
 2012-01-30 10:08:14 -08:00
Scott Main
fb300fb2f0 am 73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1 
* commit '73790a53b580b8ec8eff88e25a19b5fcfa33392a':
  docs: add G+ page announcement to homepage
 2012-01-30 10:05:59 -08:00