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

11832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
ae32322dbe am b2e9e7dd: am d5b090b2: am 348b92bd: Merge change Iee227ace into eclair 
Merge commit 'b2e9e7dd4e027502682dfe4cb6242c3a5f3c1589'

* commit 'b2e9e7dd4e027502682dfe4cb6242c3a5f3c1589':
 2009-10-13 12:05:50 -07:00
Eric Laurent
07d41968b8 am 032d7fed: am 88bd8c0f: am ff94720b: Merge change I80a6a229 into eclair 
Merge commit '032d7fed1966371a080d787d7d37a06e0fb8eef0'

* commit '032d7fed1966371a080d787d7d37a06e0fb8eef0':
 2009-10-13 12:05:40 -07:00
Jaikumar Ganesh
df40289885 am 6e349140: am 8d6893dc: am 9d5b5899: Merge change Ie5d93b7e into eclair 
Merge commit '6e34914069374b443aad30ea9a02177cccf2a2ab'

* commit '6e34914069374b443aad30ea9a02177cccf2a2ab':
 2009-10-13 12:05:29 -07:00
John Wang
8619b835eb am d4d874ce: am 2d4b58f2: am 33e21fcc: Control H icon display in Status bar. 
Merge commit 'd4d874ce489e14ded067a6da380a9603594b639a'

* commit 'd4d874ce489e14ded067a6da380a9603594b639a':
 2009-10-13 12:05:18 -07:00
Romain Guy
049952d2c4 am 3f90b7b8: am 94ee9260: am 3b36ed09: Merge change I95319bde into eclair 
Merge commit '3f90b7b81d30110c78bdb52aae2f7af43d071296'

* commit '3f90b7b81d30110c78bdb52aae2f7af43d071296':
 2009-10-13 12:05:09 -07:00
Daisuke Miyakawa
36b1d70d3b am 472a21d8: am bd3d5b25: am 387e73bd: Merge change Ib977f2bd into eclair 
Merge commit '472a21d84dcafccb5a7d78c362329e748921bdab'

* commit '472a21d84dcafccb5a7d78c362329e748921bdab':
 2009-10-13 12:04:58 -07:00
Eric Fischer
945ff20243 am 94f3a363: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '94f3a36326ddecaa09787d795451b0a229fe111c'

* commit '94f3a36326ddecaa09787d795451b0a229fe111c':
  Remove STOPSHIP BT logging.
  BT API security audit: fix a couple of permission mistakes.
  Fix issue #2175693: Add vmallocinfo to dumpstate
  add a way to easily catch and log GL errors (compile time flag)
  GPS: Fix problem with SUPL when SUPL APN is already active.
  Import revised translations.  DO NOT MERGE
  Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
  Import revised translations.  DO NOT MERGE
 2009-10-13 12:04:49 -07:00
Andreas Huber
74ae80b623 am 1c83540e: am 2d295a96: Merge change Iedebfe8d into eclair-mr2 
Merge commit '1c83540e3829dc9664728f1f017686f16f61a4ea'

* commit '1c83540e3829dc9664728f1f017686f16f61a4ea':
  Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
 2009-10-13 11:59:00 -07:00
Robert Greenwalt
50e90ed6c9 am 6036288a: am c33623a0: Merge change Iba087ecc into eclair-mr2 
Merge commit '6036288ad953e56433a9936fad09213b328cad71'

* commit '6036288ad953e56433a9936fad09213b328cad71':
  Make FWK start a wifi scan if supplicant forgets.
 2009-10-13 11:58:50 -07:00
Andreas Huber
fccdd7aee8 am 39c923a9: am 23bccd6c: Merge change I729c3938 into eclair-mr2 
Merge commit '39c923a94c377a75e34153f6dddb83fc9883d2a7'

* commit '39c923a94c377a75e34153f6dddb83fc9883d2a7':
  Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
 2009-10-13 11:58:40 -07:00
Brett Chabot
8a17c1e7c9 am 0221ec55: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '0221ec55ac57f32a42fb1e7b66779ca955d58558'

* commit '0221ec55ac57f32a42fb1e7b66779ca955d58558':
  Control H icon display in Status bar.
  Fixes #2175599. Prevents an NPE when AttachInfo is null.
  Set the Bond State to NONE when we receive a Agent Cancel.
  Make vCard import Photo from vCard file :(
 2009-10-13 11:58:31 -07:00
Tadashi G. Takaoka
5f34bf1be3 am 7c270311: am 50b11ec6: Merge change I4d828c3a into eclair-mr2 
Merge commit '7c270311f7167080112494c3095c984b1a141074'

* commit '7c270311f7167080112494c3095c984b1a141074':
  QuickContactBadge: Make lookup key query asynchronous.
 2009-10-13 11:58:00 -07:00
Joshua Bartel
d4ff88f9f7 am 7ff38319: am 41ae5d5a: am bd324c9b: Merge change I50a321c9 into eclair 
Merge commit '7ff38319498eddbe4155f1889e2aa04565095c28'

* commit '7ff38319498eddbe4155f1889e2aa04565095c28':
 2009-10-13 11:56:29 -07:00
Daisuke Miyakawa
7473780fd9 am 5f836334: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '5f836334e3af9c0cdfcde1f3b6a51c46a6a12412'

* commit '5f836334e3af9c0cdfcde1f3b6a51c46a6a12412':
  LocationManagerService: Fix race when removing LocationListener
 2009-10-13 11:56:18 -07:00
Andreas Huber
c2370c424b am a6b76c35: am cd74c0d5: The vendor is about to check in a fix for this issue, the workaround is no longer needed 
Merge commit 'a6b76c35a482bd7f2cbab186aca9ea6e74a375d0'

* commit 'a6b76c35a482bd7f2cbab186aca9ea6e74a375d0':
  The vendor is about to check in a fix for this issue, the workaround is no longer needed
 2009-10-13 11:54:43 -07:00
San Mehat
3ca30486cd am c18d8696: am 4f9a7d42: am e9296876: Merge change Ib7c34cec into eclair 
Merge commit 'c18d869629783cf37f07632ece17d27d6d10dd9e'

* commit 'c18d869629783cf37f07632ece17d27d6d10dd9e':
 2009-10-13 11:54:25 -07:00
Bryan Mawhinney
7da8602646 am 296f3b04: am 07e6da0b: am f81ecc1f: Merge change I29232f2a into eclair 
Merge commit '296f3b048d348ef1eb58e7e47130bdb3f63164a3'

* commit '296f3b048d348ef1eb58e7e47130bdb3f63164a3':
 2009-10-13 11:54:14 -07:00
Marc Blank
80010ff5ee am 3c5600ec: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '3c5600ecccd38d8fb6d39330f31fe91b5f99481b'

* commit '3c5600ecccd38d8fb6d39330f31fe91b5f99481b':
  dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
  Only dismiss search dialog after launching intent.
 2009-10-13 11:54:04 -07:00
Fred Quintana
ee00678189 am 1f00f94f: am eb329bf2: am 8bd04b20: Merge change Iea48361d into eclair 
Merge commit '1f00f94f880803d1b9167952fa431c8f49c2f874'

* commit '1f00f94f880803d1b9167952fa431c8f49c2f874':
 2009-10-13 11:52:54 -07:00
Xia Wang
787a016d3c am ec61707d: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit 'ec61707d39c14950f53795b0610ea1ee00daecdb'

* commit 'ec61707d39c14950f53795b0610ea1ee00daecdb':
  fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204
 2009-10-13 11:52:42 -07:00
Dianne Hackborn
a2ca704a98 am 0edc952e: am 8c815d9d: am b134b203: Merge change Id8c9cb2f into eclair 
Merge commit '0edc952e290fba0309d40c54c10960c99d505e26'

* commit '0edc952e290fba0309d40c54c10960c99d505e26':
 2009-10-13 11:52:07 -07:00
Dianne Hackborn
2e4258a4a1 am c7ed01f4: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit 'c7ed01f4011e688af59f91b613e48203690c394d'

* commit 'c7ed01f4011e688af59f91b613e48203690c394d':
  More fix #2163209: alarm clock rings but is hidden behind lock screen
 2009-10-13 11:51:58 -07:00
Dave Sparks
a423e756c1 am 43fa4d92: am ec83852a: am 281acf42: Merge change I52479480 into eclair 
Merge commit '43fa4d920c1c43810fdc693aab1f3b7c4f41789a'

* commit '43fa4d920c1c43810fdc693aab1f3b7c4f41789a':
 2009-10-13 11:51:11 -07:00
Jason Sams
21b2d26ca1 am a8203875: am 48289b2e: am 7c12540f: Merge change Ibd2197fb into eclair 
Merge commit 'a8203875ed99246f79847b10b6fa84f16cc1e57a'

* commit 'a8203875ed99246f79847b10b6fa84f16cc1e57a':
 2009-10-13 11:51:00 -07:00
Doug Zongker
b2461e494d am 40f888bf: am 83b60080: am 9af53ea6: am 3161795b: when logging free space on /data, log /system and /cache as well 
Merge commit '40f888bf6116118f257770eb517110413f9c672c'

* commit '40f888bf6116118f257770eb517110413f9c672c':
 2009-10-13 11:50:51 -07:00
Mathias Agopian
175746f109 am a6e567f5: am e726f6e9: am 4ff6d01d: Merge change I46b2df15 into eclair 
Merge commit 'a6e567f59e44c377edfb76b2d1719ae1dac3182b'

* commit 'a6e567f59e44c377edfb76b2d1719ae1dac3182b':
 2009-10-13 11:50:39 -07:00
Mathias Agopian
2dd150b49b am 620d2479: am 3145c43d: am c7141303: Merge change Id23b791a into eclair 
Merge commit '620d24794cd4775deadadf7e7d69ae3d8d03de9a'

* commit '620d24794cd4775deadadf7e7d69ae3d8d03de9a':
 2009-10-13 11:50:30 -07:00
Grace Kloba
c5e6bff3ca am 9136c39d: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '9136c39d4933bcf60bff0f76bc377d1985736ea5'

* commit '9136c39d4933bcf60bff0f76bc377d1985736ea5':
  Retry overlay create if it fails. Bug 2153980.
  Add script to script call support.  Add exception to catch out of bound index data when added to TriangleMeshBuilder.
  fix [2170283] SurfaceFlinger crashes on OOM.
  fix [2164183] sometimes device just wants to stay asleep
  when logging free space on /data, log /system and /cache as well
 2009-10-13 11:50:20 -07:00
Android (Google) Code Review
ff6caa102d Merge change Id70213e7 
* changes:
  Implement GL11 and GL11Ext methods for GL Log and Error wrappers.
 2009-10-12 22:22:17 -04:00
Jack Palevich
d70213e70e Implement GL11 and GL11Ext methods for GL Log and Error wrappers. 
Until now we had been throwing UnsupportedOperationException when
developers tried to use the GL11 or GL11Ext methods. Now we handle
these methods correctly, passing their arguments through to the
wrapped interface's methods.

Fixes bug 2167522	GLUtils debug wrapper doesn't support GL11 features
 2009-10-12 19:20:49 -07:00
Grace Kloba
2e081efc61 am 6764f2ca: am a921bf4e: Merge change I8f5e405f into eclair-mr2 
Merge commit '6764f2ca442cbe906901af5296048f284adb1f7c'

* commit '6764f2ca442cbe906901af5296048f284adb1f7c':
  mGeolocationDatabasePath needs to compare mGeolocationDatabasePath
 2009-10-12 12:42:01 -07:00
Dianne Hackborn
c4d7c46f1a am 8221dc1d: am d78fbddd: am 568cae57: Fix issue #2171460: Turn off background blurring of power dialog 
Merge commit '8221dc1d02dfe73057d9b634607ee9e67b9e2076'

* commit '8221dc1d02dfe73057d9b634607ee9e67b9e2076':
 2009-10-12 12:41:51 -07:00
Dianne Hackborn
b493a1608e am fb256574: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit 'fb256574b4b5b5237ddda0efcf876b8eb436c961'

* commit 'fb256574b4b5b5237ddda0efcf876b8eb436c961':
  Fix issue #2171460: Turn off background blurring of power dialog
 2009-10-12 12:41:42 -07:00
Mathias Agopian
8299140cbf am 58226c4a: am 18fc0120: am a2de8e31: Merge change Ie05f07df into eclair 
Merge commit '58226c4a760fd25f6a926a6c72f3b9abd475278c'

* commit '58226c4a760fd25f6a926a6c72f3b9abd475278c':
 2009-10-12 12:40:59 -07:00
Mike Cleron
47f8098bee am f9b8d3e1: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit 'f9b8d3e1038032bd5eb1c36123c9066a3792fd9c'

* commit 'f9b8d3e1038032bd5eb1c36123c9066a3792fd9c':
  fix [2170319] gmail bulk operation checkbox latency on passion
 2009-10-12 12:40:47 -07:00
Dmitri Plotnikov
7b25e14e8e am 48b0f0d8: am c38f6f33: am c15934f2: Merge change I7a57637b into eclair 
Merge commit '48b0f0d8c0ac6761a2f6069287d86d21c526eb84'

* commit '48b0f0d8c0ac6761a2f6069287d86d21c526eb84':
 2009-10-12 12:40:07 -07:00
Evan Millar
df3fa9efb4 am 1fe17c5f: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '1fe17c5f2f6dd288e60f6ce7d04f491a23f53e82'

* commit '1fe17c5f2f6dd288e60f6ce7d04f491a23f53e82':
  [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
 2009-10-12 12:39:58 -07:00
Nick Pelly
4241edce08 am e0d67dfc: am d7ebc7a4: am 7a865a5d: Merge change Ieed8be00 into eclair 
Merge commit 'e0d67dfc8fced2a5131df40d1ff585c00d91da72'

* commit 'e0d67dfc8fced2a5131df40d1ff585c00d91da72':
 2009-10-12 12:39:02 -07:00
Nick Pelly
dffcd85541 am b2ad0f18: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit 'b2ad0f18bc030535687aed67f5c3a3139045dd84'

* commit 'b2ad0f18bc030535687aed67f5c3a3139045dd84':
  Introduce BluetoothAdapter.getDefaultAdapter().
 2009-10-12 12:38:48 -07:00
Nick Pelly
c0cfe8f526 am 10a55765: am 55a17d6e: am dc2ccb82: Merge change Ia4879943 into eclair 
Merge commit '10a5576559def7bbd481527c07fd1f94d6eef900'

* commit '10a5576559def7bbd481527c07fd1f94d6eef900':
 2009-10-12 12:36:15 -07:00
David 'Digit' Turner
de553351bf am 4c220bd0: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '4c220bd0f32b93314c4c1bff328bd815265ef117'

* commit '4c220bd0f32b93314c4c1bff328bd815265ef117':
  Encourage developers to connect RFCOMM by UUID instead of Channel.
 2009-10-12 12:36:03 -07:00
Romain Guy
66e146b30d am 3504ec10: am 1f42439a: am 35b38cef: Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits format when the window is 32 bits. 
Merge commit '3504ec10833f7aad7b2f2ea253de8bebaf811455'

* commit '3504ec10833f7aad7b2f2ea253de8bebaf811455':
 2009-10-12 12:35:16 -07:00
Romain Guy
a0b663bbc7 am ff9c48b3: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit 'ff9c48b3040833c7b3f85bcac116ba5f0dd247d0'

* commit 'ff9c48b3040833c7b3f85bcac116ba5f0dd247d0':
  Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
 2009-10-12 12:35:06 -07:00
Andreas Huber
ea745866de am 1e988a04: am f894d111: Merge change I6c32aa75 into eclair-mr2 
Merge commit '1e988a04b55fcaab6116b8d565b68b4f62d01633'

* commit '1e988a04b55fcaab6116b8d565b68b4f62d01633':
  Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height.
 2009-10-12 12:34:08 -07:00
Mike Reed
16501b3fc8 am 8e9d080e: am 1665b48f: am 64dd5be5: Merge change Ia78b0a2d into eclair 
Merge commit '8e9d080e44bc867da2a1aa6677e3de98931be9ea'

* commit '8e9d080e44bc867da2a1aa6677e3de98931be9ea':
 2009-10-12 12:33:56 -07:00
Jeff Hamilton
1d4eb8843e am 254d7ecd: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9'

* commit '254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9':
  add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
 2009-10-12 12:33:44 -07:00
Amith Yamasani
92f72ec1bc am 360fde8e: am 446aeb1c: Merge change Ia98129b9 into eclair-mr2 
Merge commit '360fde8eabdc9c45d1b52e350ccfb4bac9d93107'

* commit '360fde8eabdc9c45d1b52e350ccfb4bac9d93107':
  Fix preference caching to increase recycling of preference views.
 2009-10-12 12:32:39 -07:00
Elliott Hughes
ce2d60e91e am 4f0c414c: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '4f0c414c091daa54ac7997b7438995279506f791'

* commit '4f0c414c091daa54ac7997b7438995279506f791':
 2009-10-12 12:32:28 -07:00
Eric Fischer
bd08893873 am 6a230c10: (-s ours) am 6756e440: am e4b6639d: (-s ours) Merge change I9db1edea into eclair 
Merge commit '6a230c105a9d74c813b106689539b82fbda7d9b4'

* commit '6a230c105a9d74c813b106689539b82fbda7d9b4':
  Import revised translations.   DO NOT MERGE
 2009-10-12 12:32:07 -07:00
Dianne Hackborn
755d3cf20c am c4f52bd7: am 7e5c5d97: am 0c3154d3: Fix issue #2163654: deadlock, runtime restart 
Merge commit 'c4f52bd7550f57b1d483091a71871653d8928901'

* commit 'c4f52bd7550f57b1d483091a71871653d8928901':
  Fix issue #2163654: deadlock, runtime restart
 2009-10-12 12:31:56 -07:00