ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
43,326 Commits 2 Branches 0 Tags 54 MiB
42f82b4da5
Commit Graph

43326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
84987b20ea Merge "Fix 2 broken PhoneNumberUtilsTest." 2012-01-31 09:14:57 -08:00
Scott Main
7a3c2dfc39 am 123ffc1f: am 34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1 
* commit '123ffc1fa40749dd2f2eef94fa1ab0306604b1ae':
  docs: fix locale name; South Africa is local en_ZA external issue 23133
 2012-01-31 08:58:51 -08:00
Scott Main
61cf2efec0 am 21e32f20: am 8bfeb10f: Merge "docs: fix typo in market doc external issue 22650" into ics-mr1 
* commit '21e32f209794dffa51ad61e85a3e0b5070593790':
  docs: fix typo in market doc external issue 22650
 2012-01-31 08:58:49 -08:00
Scott Main
4630cb7804 resolved conflicts for merge of 20d06540 to master 
Change-Id: I80da9a11b4538c070b0000cfa3ea6cd865e46aef
 2012-01-31 08:55:23 -08:00
Scott Main
7b8d173a28 am 34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1 
* commit '34260ad79ede2ed35cc9859095b778f194b9650b':
  docs: fix locale name; South Africa is local en_ZA external issue 23133
 2012-01-31 08:41:03 -08:00
Scott Main
78dbcd5f1a am 8bfeb10f: Merge "docs: fix typo in market doc external issue 22650" into ics-mr1 
* commit '8bfeb10f98125706d8bb7afa1067ca563e741540':
  docs: fix typo in market doc external issue 22650
 2012-01-31 08:41:01 -08:00
Scott Main
105713549f am 665a6693: am b86cba15: docs: fix typo in eclipse doc external issue 21475 
* commit '665a6693f72460a0d04a5ab70c10dee5493b9df2':
  docs: fix typo in eclipse doc external issue 21475
 2012-01-31 08:40:59 -08:00
Scott Main
38a89182b5 am 4b2eb9a5: Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1 
* commit '4b2eb9a50bbead0b756944ebffd01c89916896ad':
  docs: fix typos and clarify some grammar in summary external issue 21548
 2012-01-31 08:40:59 -08:00
Scott Main
addfd725e7 Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1 2012-01-31 08:39:36 -08:00
Scott Main
33e837a5de Merge "docs: fix typo in market doc external issue 22650" into ics-mr1 2012-01-31 08:39:03 -08:00
Scott Main
32d086fc1e am b86cba15: docs: fix typo in eclipse doc external issue 21475 
* commit 'b86cba156c78740793d94444e01d17ef21cb53cc':
  docs: fix typo in eclipse doc external issue 21475
 2012-01-31 08:38:49 -08:00
Scott Main
0bd3b2ff51 Merge "docs: fix typos and clarify some grammar in summary external issue 21548" into ics-mr1 2012-01-31 08:37:59 -08:00
Andreas Huber
22b9ceb0b7 Merge "Make sure our aac decoder handles this parameter." 2012-01-31 08:31:03 -08:00
Wink Saville
11e744fe68 Merge "Display roaming indicator icon only based on ERI in CDMA case." 2012-01-31 06:39:52 -08:00
Ben Murdoch
3c35624057 Merge "Remove code that quits the webcore watchdog thread." 2012-01-31 02:17:12 -08:00
The Android Automerger
50712688a6 merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 23:33:37 -08:00
Mathias Agopian
2bfa31c0cc Nexus S now reports the proper frame-rate 
don't hardcode it.

Change-Id: I4b37f37a9809cac937e6334c988b3185af2ebe22
 2012-01-30 18:45:15 -08:00
Mathias Agopian
fb87e54a9a 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
0d6aa287d1 Merge "add all needed GL extension wrappers" 2012-01-30 17:44:09 -08:00
Romain Guy
54d534d1d9 Merge "Add debug markers to OpenGLRenderer" 2012-01-30 17:43:37 -08:00
Mathias Agopian
a6d86e5ea7 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
de8f7d0dcc Merge "Removed SoftInputShownOnFocus methods in TextView" 2012-01-30 17:01:19 -08:00
Svetoslav Ganov
9dbcc3157d Merge "Incorrect behavior of View clear focus." 2012-01-30 16:37:33 -08:00
Scott Main
91da1b9796 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
135c935a47 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
0aa8f39a3d 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
5d10c6015c 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
Mathias Agopian
590f9e20ea Merge "SF now synchronizes to VSYNC" 2012-01-30 15:24:46 -08:00
Eric Fischer
a70c6e98aa Merge "Import translations. DO NOT MERGE" 2012-01-30 15:24:41 -08:00
Mathias Agopian
9e2464c4b9 Merge "add support for GL_EXT_debug_marker" 2012-01-30 15:23:47 -08:00
Mathias Agopian
8aedd4737d SF now synchronizes to VSYNC 
Change-Id: Ic5e4f2ea9927ce133eef9499c03161325e9d02c5
 2012-01-30 15:21:23 -08:00
Scott Main
79bc3654c3 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
Romain Guy
63cfc1d2ad Merge "Always initialize AsyncTask on the main thread." 2012-01-30 14:12:37 -08:00
The Android Open Source Project
81523a063c 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
de973467d4 Reconcile with ics-mr1-release 
Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2
 2012-01-30 13:36:34 -08:00
The Android Automerger
14ccfc4a72 merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 13:23:32 -08:00
Gilles Debunne
5cfb7bcdb3 Merge "Remove onPreDrawListeners earlier in TextView" 2012-01-30 12:58:53 -08:00
Dianne Hackborn
cfc91b1b1a 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
128fe3141e 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
2e6f082987 Merge "Update documentation to reflect the old approach not working." into ics-mr1 2012-01-30 12:52:11 -08:00
Andreas Huber
541bf88d67 Merge "Instantiate software codecs locally whenever possible." 2012-01-30 12:32:58 -08:00
Stephen Hines
8022e5d428 Merge "Fix potential bug with reordered size/offset arguments." 2012-01-30 12:22:10 -08:00
Romain Guy
2971a440a6 Merge "Add stencil buffer to the EGL config" 2012-01-30 12:05:28 -08:00
Jeff Sharkey
4d08dbc61a Merge "Move away from deprecated NetworkInfo extra." 2012-01-30 11:53:32 -08:00
John Wang
54d89516ef 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
e97d8f554d 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
John Wang
a493ce1366 Merge "Adjust the LTE signal bar mapping." into ics-mr1 2012-01-30 11:20:35 -08:00
Makoto Onuki
d5106a1266 Merge "Fixing broken unittests." 2012-01-30 11:16:58 -08:00
Scott Main
7d37498017 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
33a92006e1 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