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

11905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
e25adeaf41 am e1ba4226: am 936fff36: Merge change Ib64cab41 into eclair-mr2 
Merge commit 'e1ba422636937ee1ca84938d018282344d319543'

* commit 'e1ba422636937ee1ca84938d018282344d319543':
  Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
 2009-10-13 14:28:35 -07:00
Robert Greenwalt
c834b53f42 am c2bc31b4: am 2515cf85: am 98e0b146: Make PhoneStateListeners not call TelephonyManager 
Merge commit 'c2bc31b45e14b1ea261492ee531ed5bb2aac12d4'

* commit 'c2bc31b45e14b1ea261492ee531ed5bb2aac12d4':
 2009-10-13 14:27:25 -07:00
Grace Kloba
8838849203 am 4496a3fe: am a1c0506e: am 1184313c: Setting WebCore cache limit depending on the memory class. 
Merge commit '4496a3fecabb26671e745c2b6edcb54989f8c045'

* commit '4496a3fecabb26671e745c2b6edcb54989f8c045':
 2009-10-13 14:27:14 -07:00
David Krause
1215c57ed8 am a614b948: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit 'a614b948e18189adfe8e2553754db574ecb3fd7a'

* commit 'a614b948e18189adfe8e2553754db574ecb3fd7a':
  Make PhoneStateListeners not call TelephonyManager
  Setting WebCore cache limit depending on the memory class.
 2009-10-13 14:27:04 -07:00
Dan Egnor
d23024b05c am 371071c1: am e9d8f545: am 6903d5ce: Merge change Iee649a81 into eclair 
Merge commit '371071c195138312a8829c198b24b7cb41bf7bc2'

* commit '371071c195138312a8829c198b24b7cb41bf7bc2':
 2009-10-13 12:11:40 -07:00
Jeff Sharkey
ef7739d453 am 6815a67c: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '6815a67c5322cbde7768330fd12882d955abdd2a'

* commit '6815a67c5322cbde7768330fd12882d955abdd2a':
  Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
 2009-10-13 12:11:28 -07:00
Daisuke Miyakawa
463285bfa4 am a6a96cf4: am c93b88cf: Remove redundant comment. As of now, we cannot guarantee anything toward external developers. 
Merge commit 'a6a96cf40e6e5349715ca6d2c81602d72d37da24'

* commit 'a6a96cf40e6e5349715ca6d2c81602d72d37da24':
  Remove redundant comment. As of now, we cannot guarantee anything toward external developers.
 2009-10-13 12:11:11 -07:00
Daisuke Miyakawa
7a6ba0f442 am 258bc9cb: am 5a016488: Merge commit \'refs/changes/08/29008/8\' of ssh://dmiyakawa@android-git.corp.google.com:29418/platform/frameworks/base into cleanup_import 
Merge commit '258bc9cb44f637d9ea1377d81a995bec2bd10a1d'

* commit '258bc9cb44f637d9ea1377d81a995bec2bd10a1d':
  Develop ContentResolver-based unit tests for vCard importer and fix vCard code
 2009-10-13 12:11:01 -07:00
Jim Miller
b4b79dc0db am 65f0f97a: am b1fdb1d3: am ad60e7fe: Merge change I9485aec1 into eclair 
Merge commit '65f0f97aa700df38a6183b97f7bb8c6f82367285'

* commit '65f0f97aa700df38a6183b97f7bb8c6f82367285':
 2009-10-13 12:10:41 -07:00
Dianne Hackborn
9a5fb4916e am 43ebb2d9: am 81aaf56f: am 2c6c5e6e: Fix issue #2176944: Need API so browser, others can determine memory size of device 
Merge commit '43ebb2d91518cac40c43ceb098fcf11b92959d31'

* commit '43ebb2d91518cac40c43ceb098fcf11b92959d31':
 2009-10-13 12:10:32 -07:00
Dianne Hackborn
26ae62e810 am 198dcc9d: am 0c35e6ff: am d10d02f5: Merge change I490e01ba into eclair 
Merge commit '198dcc9d6f6ce1d6582d67e342f3833af4afe33b'

* commit '198dcc9d6f6ce1d6582d67e342f3833af4afe33b':
 2009-10-13 12:10:23 -07:00
Dianne Hackborn
8485380aaa am d3332dd1: am 479e8004: am 89becd79: Fix issue #2177262: Improve animations 
Merge commit 'd3332dd1135571723c891a672fe51b9b27f66282'

* commit 'd3332dd1135571723c891a672fe51b9b27f66282':
 2009-10-13 12:10:13 -07:00
James Dong
ead92ef490 am 6195432b: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '6195432b6fde3cda4bc7e2406c8f2975795933a7'

* commit '6195432b6fde3cda4bc7e2406c8f2975795933a7':
  Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
  Fix issue #2176944: Need API so browser, others can determine memory size of device
  Fix issue #2177262: Improve animations
  Fix issue #2174566: HOT STABILITY: NPE in activity manager
 2009-10-13 12:10:02 -07:00
Dianne Hackborn
1f6d620f64 am 68f857cd: am dc76d696: am 9e2562b8: Merge change I88c6e267 into eclair 
Merge commit '68f857cd442c2e9b91ffb5111a5fbae7ac72edc8'

* commit '68f857cd442c2e9b91ffb5111a5fbae7ac72edc8':
 2009-10-13 12:06:59 -07:00
Nick Pelly
b1fd1e1ff0 am eb772880: am 59778b3c: am db7ae10d: (-s ours) Remove STOPSHIP BT logging. 
Merge commit 'eb772880e3e0ca472fc632af19543a8b17a03598'

* commit 'eb772880e3e0ca472fc632af19543a8b17a03598':
 2009-10-13 12:06:50 -07:00
Nick Pelly
db97ecf59f am dfb4a75d: am 65d028ae: am e6ee3be1: BT API security audit: fix a couple of permission mistakes. 
Merge commit 'dfb4a75da23d54bccef29c879b0c2beb52538f0c'

* commit 'dfb4a75da23d54bccef29c879b0c2beb52538f0c':
 2009-10-13 12:06:31 -07:00
Mathias Agopian
709d14684a am d4d7db53: am 75017f3c: am 846322a9: Merge change Ib96df854 into eclair 
Merge commit 'd4d7db53463785450d9c6162420c9cea8c155134'

* commit 'd4d7db53463785450d9c6162420c9cea8c155134':
 2009-10-13 12:06:21 -07:00
Eric Fischer
de4ea07cdf am 084e062a: (-s ours) am 9dd00e7a: am aaa6299b: (-s ours) am 24c8645a: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '084e062a90806080beb892588bb6aca68e5c0cc1'

* commit '084e062a90806080beb892588bb6aca68e5c0cc1':
 2009-10-13 12:06:11 -07:00
Jean-Baptiste Queru
b484648b6a am d0a513d1: (-s ours) am 6fc4b1f1: am ea110274: (-s ours) am ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms 
Merge commit 'd0a513d17cc4132159591895e969da78a6c4e99a'

* commit 'd0a513d17cc4132159591895e969da78a6c4e99a':
 2009-10-13 12:05:59 -07:00
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