Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,781 Commits 3 Branches 0 Tags
fccdd7aee8617538ccb73b2686a0a53a0f39259e
Commit Graph

4753 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Cary Clark
56f726cbb6 am fface18d: am 5da9aeb4: reset webTextView size if focus bounds changes 
Merge commit 'fface18d254900cff57623c364f47d929b4089f6'

* commit 'fface18d254900cff57623c364f47d929b4089f6':
  reset webTextView size if focus bounds changes
 2009-10-12 12:29:36 -07:00
Bjorn Bringert
e3b90ecd3f am ef8e6b56: am 19400067: am 4625758d: Merge change I2c5f1e76 into eclair 
Merge commit 'ef8e6b5672c91baab09d5699b5a3ca0cb33ced6b'

* commit 'ef8e6b5672c91baab09d5699b5a3ca0cb33ced6b':
  Fix back button handling in ACTV
 2009-10-12 12:28:50 -07:00
Fred Quintana
a1933d7dfc am 7fc5e5ab: am f9f7718f: am f038004f: changes from Sync Manager API Review: bug 2164262 
Merge commit '7fc5e5ab6d404d13136d30b724975798717f57f0'

* commit '7fc5e5ab6d404d13136d30b724975798717f57f0':
  changes from Sync Manager API Review: bug 2164262
 2009-10-12 12:28:37 -07:00
Ray Chen
9b98e49f62 am 2f2634e5: am 13ed5750: Add group id to getThumbnail and cancelThumbnailRequest API. 
Merge commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc'

* commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc':
  Add group id to getThumbnail and cancelThumbnailRequest API.
 2009-10-12 11:48:10 -07:00
Robert Greenwalt
0de99ced5b am 2a9b411d: am e8830120: am 92b5caa4: Merge change Id8df149c into eclair 
Merge commit '2a9b411d4ed60acbe089068c93850ecd049f57f2'

* commit '2a9b411d4ed60acbe089068c93850ecd049f57f2':
  Turn some logging back on in ConnectionManager
 2009-10-12 11:46:54 -07:00
Jim Miller
1c862c2978 am e15dc6e1: am ca4efac9: am f65161f1: Merge change If933b13d into eclair 
Merge commit 'e15dc6e19f944889a8d9f3fb97b014aa7d298de9'

* commit 'e15dc6e19f944889a8d9f3fb97b014aa7d298de9':
  Fix for 2161835: Tweaks to rotary lock screen:
 2009-10-12 11:44:59 -07:00
Wu-cheng Li
83a880065f am 3616d154: am 80fff7a5: am 962f2536: Merge change I547cff66 into eclair 
Merge commit '3616d15451734bd3b563d73f9c2f25c19d7df75c'

* commit '3616d15451734bd3b563d73f9c2f25c19d7df75c':
  Add zoom functions and sendCommand.
 2009-10-12 11:44:39 -07:00
Fred Quintana
d0b6760f37 am 7a5262a6: am 72fc14e8: am f83d9b3f: fix build breakage 
Merge commit '7a5262a620819e85cdcc6441bf0eb0b05dafe46b'

* commit '7a5262a620819e85cdcc6441bf0eb0b05dafe46b':
  fix build breakage
 2009-10-12 11:44:28 -07:00
Fred Quintana
e932cf997e am 11aaaa70: am 77a7bdce: am 5bba632d: - hide Entity and all its references - remove updateEntity and insertEntity, since they are not used - add the RawContacts.Entity class, which is used in lieu of the android.content.Entity 
Merge commit '11aaaa70b75aa919b385289c5b06bbd20f9e424d'

* commit '11aaaa70b75aa919b385289c5b06bbd20f9e424d':
  - hide Entity and all its references
 2009-10-12 11:44:16 -07:00
Suchi Amalapurapu
e5441dd9e7 am 5a535026: am ef3c63ad: am 5163cd6d: Merge change I5be3d603 into eclair 
Merge commit '5a535026bfc1d091c0d029b21cc63f929c2def0a'

* commit '5a535026bfc1d091c0d029b21cc63f929c2def0a':
  Make sdk version and code names static finals in PackageParser.
 2009-10-12 11:44:05 -07:00
Daisuke Miyakawa
1fa3fd7d2f am 4613007b: am 629f94fa: am ccc214b2: Merge change I6a0b14bd into eclair 
Merge commit '4613007b5755ed95a3a649909b4702400863f9b4'

* commit '4613007b5755ed95a3a649909b4702400863f9b4':
  Make VCardComposer create the instance for mHandlerList.
 2009-10-12 11:41:20 -07:00
Nick Pelly
da0703e190 am 3f25987d: am d4cf13a6: am 52cde727: Fix docs builds. 
Merge commit '3f25987d331b1d3585e32131b05351b86ec14b70'

* commit '3f25987d331b1d3585e32131b05351b86ec14b70':
  Fix docs builds.
 2009-10-12 11:38:48 -07:00
Nick Pelly
4c08b8b5b8 am a1cb6a64: am 460965c2: am 24bb9b8a: Provide an API for apps to use a dynamic RFCOMM channel and SDP record. 
Merge commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09'

* commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09':
  Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
 2009-10-12 11:38:32 -07:00
Fred Quintana
97c9203b41 am 70cdb4d6: am 0eb2d838: am 5fbaefc3: Merge change I4db3a5b3 into eclair 
Merge commit '70cdb4d684e2821b614562fdb868140154db0026'

* commit '70cdb4d684e2821b614562fdb868140154db0026':
  fix a javadoc build breakage
 2009-10-12 11:35:13 -07:00
Dianne Hackborn
9809d5149b am 4bc6158d: am baad552d: am 68d881cf: Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast 
Merge commit '4bc6158d6bdeff796cfd61d489c01db0d203534c'

* commit '4bc6158d6bdeff796cfd61d489c01db0d203534c':
  Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
 2009-10-12 11:34:00 -07:00
Romain Guy
46ba71accc am e1bf39bc: am cb40ba28: am 89c76843: Merge change I9b771df3 into eclair 
Merge commit 'e1bf39bc764c78344dd2a6c59c5709919bdc1da9'

* commit 'e1bf39bc764c78344dd2a6c59c5709919bdc1da9':
  Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
 2009-10-12 11:33:30 -07:00
Fred Quintana
8b78a28c1c am 4df43ae4: am 7d7ab5ae: am 24f32b32: Merge change I89c40f50 into eclair 
Merge commit '4df43ae4a793ac81d95c0b50967d444ca2d28ffa'

* commit '4df43ae4a793ac81d95c0b50967d444ca2d28ffa':
  fix a javadoc build breakage
 2009-10-12 11:32:39 -07:00
Daisuke Miyakawa
7e6add305b am 36cad7be: am 07086eb9: Merge change Ifb63d236 into eclair-mr2 
Merge commit '36cad7be504608a538c845b4a44f0dcee157a338'

* commit '36cad7be504608a538c845b4a44f0dcee157a338':
  Add cancel() VCardDataBuilder, which is intended to remove
 2009-10-12 11:32:00 -07:00
Bjorn Bringert
752e430384 am a4323999: am 3448b676: am 9e4c8561: Merge change I8d48149c into eclair 
Merge commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394'

* commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394':
  Don't reinflate search bar when dialog is already showing
 2009-10-12 11:31:11 -07:00
Grace Kloba
caee7d1d21 am 11782b90: am 7fd7534b: Merge change I5101c2b1 into eclair-mr2 
Merge commit '11782b905292ebde1b591f6561913affdfd415fc'

* commit '11782b905292ebde1b591f6561913affdfd415fc':
  Extend the date time to handle the case where the
 2009-10-12 11:30:37 -07:00
Fred Quintana
839e35d93d am fe9d00bc: am bf13850b: am f7ae77cd: account manager api review changes 
Merge commit 'fe9d00bc9cf84e7edf67fc6790fd4b05113d5886'

* commit 'fe9d00bc9cf84e7edf67fc6790fd4b05113d5886':
  account manager api review changes
 2009-10-12 11:29:33 -07:00
Dianne Hackborn
20db4edc0b am 492eb109: am 48e6725c: Merge change Iaca22686 into eclair 
Merge commit '492eb109ff704c0dfec447a88920657cb230b8d6'

* commit '492eb109ff704c0dfec447a88920657cb230b8d6':
  Work on issue #2163789: Way too much logging
 2009-10-12 11:21:30 -07:00
Wei Huang
d80f43f45e am 0200394a: am 6b370745: bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri. 
Merge commit '0200394a0d8da5fd1a34e7366c1e021db8ccb46c'

* commit '0200394a0d8da5fd1a34e7366c1e021db8ccb46c':
  bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
 2009-10-12 11:19:57 -07:00
David Brown
72d45f51ec am fdc8c782: am 88e03757: RotarySelector widget: add callback for "grabbed" state changes. 
Merge commit 'fdc8c7826aacb51d3d2bd22af5a511add413725d'

* commit 'fdc8c7826aacb51d3d2bd22af5a511add413725d':
  RotarySelector widget: add callback for "grabbed" state changes.
 2009-10-12 11:19:36 -07:00
Leon Scroggins
6f9eb392b0 am fde23e39: Merge change Ic66f68a7 into eclair-mr2 
Merge commit 'fde23e398e9b880eec6269adf5afaca1f58e58f7'

* commit 'fde23e398e9b880eec6269adf5afaca1f58e58f7':
  Fix a null pointer exception caught by the monkey.
 2009-10-12 11:18:21 -07:00
Grace Kloba
b761888032 am 9eca703d: Merge change I499a9541 into eclair-mr2 
Merge commit '9eca703d08ef2ef81796519fdd60a774380c7d4c'

* commit '9eca703d08ef2ef81796519fdd60a774380c7d4c':
  setupRedirect() can throw. Catch it and signal the error.
 2009-10-12 11:18:08 -07:00
Patrick Scott
768c3cae5f am 86806ce1: Process synchronous requests in the same RequestQueue. 
Merge commit '86806ce11a89260147d7c2efa2c192b711d923db'

* commit '86806ce11a89260147d7c2efa2c192b711d923db':
  Process synchronous requests in the same RequestQueue.
 2009-10-12 11:17:58 -07:00
Romain Guy
20e3c9d818 am 18d1255e: Prevents memory leaks by correctly detaching views in AbsListView. 
Merge commit '18d1255ebe83d73df34832f2197a1e51ea717b96'

* commit '18d1255ebe83d73df34832f2197a1e51ea717b96':
  Prevents memory leaks by correctly detaching views in AbsListView.
 2009-10-12 10:16:14 -07:00
Brett Chabot
0221ec55ac Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-08 14:38:45 -07:00
Jaikumar Ganesh
bfbe8522a7 am 9d5b5899: Merge change Ie5d93b7e into eclair 
Merge commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-plus-aosp

* commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
  Set the Bond State to NONE when we receive a Agent Cancel.
 2009-10-08 13:18:30 -07:00
Android (Google) Code Review
9d5b58991e Merge change Ie5d93b7e into eclair 
* changes:
  Set the Bond State to NONE when we receive a Agent Cancel.
 2009-10-08 16:11:13 -04:00
Romain Guy
1086329f00 am 3b36ed09: Merge change I95319bde into eclair 
Merge commit '3b36ed09293965e7e5dc20dfa514422388e796d6' into eclair-plus-aosp

* commit '3b36ed09293965e7e5dc20dfa514422388e796d6':
  Fixes #2175599. Prevents an NPE when AttachInfo is null.
 2009-10-08 11:19:14 -07:00
Daisuke Miyakawa
4cdb554d19 am 387e73bd: Merge change Ib977f2bd into eclair 
Merge commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7' into eclair-plus-aosp

* commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7':
  Make vCard import Photo from vCard file :(
 2009-10-08 11:19:08 -07:00
Tadashi G. Takaoka
7c270311f7 am 50b11ec6: Merge change I4d828c3a into eclair-mr2 
Merge commit '50b11ec6d955f098c2b8f9cd0573e494442cfc24' into eclair-mr2-plus-aosp

* commit '50b11ec6d955f098c2b8f9cd0573e494442cfc24':
  QuickContactBadge: Make lookup key query asynchronous.
 2009-10-08 11:17:14 -07:00
Tadashi G. Takaoka
01fd4e1226 QuickContactBadge: Make lookup key query asynchronous. 
Internal Bug: http://b/2130588
 2009-10-08 11:06:39 -07:00
Android (Google) Code Review
3b36ed0929 Merge change I95319bde into eclair 
* changes:
  Fixes #2175599. Prevents an NPE when AttachInfo is null.
 2009-10-08 13:53:54 -04:00
Android (Google) Code Review
387e73bd8f Merge change Ib977f2bd into eclair 
* changes:
  Make vCard import Photo from vCard file :(
 2009-10-08 13:49:39 -04:00
Romain Guy
a62e4705d5 Fixes #2175599. Prevents an NPE when AttachInfo is null. 
This bug was introduced by a change made to query the window's opacity.

Approved by mcleron.

Change-Id: I95319bde72b0faade095bbbbb317e84b9be8efa8
 2009-10-08 10:48:54 -07:00