Commit Graph

1672 Commits

Author SHA1 Message Date
Android (Google) Code Review
6ae11859ae am 07ca8c71: Merge change 4438 into donut
Merge commit '07ca8c71f47ac8c61b3aef0210e44d2c48e62e48'

* commit '07ca8c71f47ac8c61b3aef0210e44d2c48e62e48':
  Fix many of the ANRs introduced by scheduling classes.
2009-06-17 15:39:06 -07:00
Android (Google) Code Review
12fcd1e944 am a0a854d4: Merge change 4398 into donut
Merge commit 'a0a854d47f9dc38ce41505f973aea01842694fb5'

* commit 'a0a854d47f9dc38ce41505f973aea01842694fb5':
  Using Locale to specify language and country for a TTS language to load,
2009-06-17 15:39:03 -07:00
Android (Google) Code Review
b1ec0ba86f am 2cf3971e: Merge change 4460 into donut
Merge commit '2cf3971ea4d22f8981ae71e6ba358f19e1628d09'

* commit '2cf3971ea4d22f8981ae71e6ba358f19e1628d09':
  Use the new keystore API in vpn service.
2009-06-17 15:38:47 -07:00
Satish Sampath
0680c44fc8 am bf23fe06: Prepare SearchManager framework for adding Genie logging.
Merge commit 'bf23fe062ab4321143717c21827d329e087cc72f'

* commit 'bf23fe062ab4321143717c21827d329e087cc72f':
  Prepare SearchManager framework for adding Genie logging.
2009-06-17 15:38:42 -07:00
Android (Google) Code Review
ccb50459fe am 5c1c40d2: Merge change 4455 into donut
Merge commit '5c1c40d28cb4c0dc5efbdb6e9e695685044606e9'

* commit '5c1c40d28cb4c0dc5efbdb6e9e695685044606e9':
  add feedback test with gsm7bit special case characters
2009-06-17 15:38:39 -07:00
Android (Google) Code Review
cd70c81228 am 528a29f8: Merge change 4326 into donut
Merge commit '528a29f886f9cb9266e1fda2d2c9e0ea7ea88faf'

* commit '528a29f886f9cb9266e1fda2d2c9e0ea7ea88faf':
  Don't get location in search dialog.
2009-06-17 15:38:36 -07:00
Android (Google) Code Review
b08e0936d7 am 9fbeb7da: Merge change 4337 into donut
Merge commit '9fbeb7da1318bf5b65588a759332d74540306c06'

* commit '9fbeb7da1318bf5b65588a759332d74540306c06':
  Change the keystore APIs.
2009-06-17 15:38:33 -07:00
Mitsuru Oshima
f51e666401 am d9aef73f: Squashed commit of the following:
Merge commit 'd9aef73f72cb11ba7f278a0ef13c6d02ffc95851'

* commit 'd9aef73f72cb11ba7f278a0ef13c6d02ffc95851':
  Squashed commit of the following:
2009-06-17 15:38:12 -07:00
Joe Onorato
f757bd0710 am 5f15d151: checkpoint BackupDatAInput / RestoreHelper
Merge commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e'

* commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e':
  checkpoint BackupDatAInput / RestoreHelper
2009-06-17 15:38:08 -07:00
Christopher Tate
ae13d759db am aa088447: Hold the current transport instantiated all the time.
Merge commit 'aa088447baadd2e0bbcfd18cc529645610c13ddc'

* commit 'aa088447baadd2e0bbcfd18cc529645610c13ddc':
  Hold the current transport instantiated all the time.
2009-06-17 15:37:53 -07:00
Android (Google) Code Review
f23796ab47 Merge change 4501
* changes:
  Add support to BitmapFactory for decoding a bitmap from a MemoryFile FileDescriptor.
2009-06-17 14:32:02 -07:00
Android (Google) Code Review
1511793343 Merge change 4471
* changes:
  MemoryFile.isMemoryFile was internally determining the length of the ashmem region. This is actually useful information to have, so expose that more directly.
2009-06-17 14:04:35 -07:00
Christopher Tate
b25abf851f am 63d27000: Allow privileged callers to schedule a backup pass for any app.
Merge commit '63d2700036d0f73cbde27f0fa724d30045b4bb07'

* commit '63d2700036d0f73cbde27f0fa724d30045b4bb07':
  Allow privileged callers to schedule a backup pass for any app.
2009-06-17 10:48:22 -07:00
Romain Guy
8d1472003a am e705f2c5: Make gestures visible again.
Merge commit 'e705f2c52e683bdad2e845b50df6b6cbed660614'

* commit 'e705f2c52e683bdad2e845b50df6b6cbed660614':
  Make gestures visible again.
2009-06-17 10:48:19 -07:00
Android (Google) Code Review
33c7366ba1 Merge change 4438 into donut
* changes:
  Fix many of the ANRs introduced by scheduling classes.
2009-06-17 10:38:44 -07:00
Android (Google) Code Review
3c4d30218c Merge change 4398 into donut
* changes:
  Using Locale to specify language and country for a TTS language to load, rather than a String. Cleanup in doc for TextToSpeech, and addition of queue mode constants.
2009-06-17 10:36:43 -07:00
Android (Google) Code Review
74b00231cc Merge change 4460 into donut
* changes:
  Use the new keystore API in vpn service.
2009-06-17 06:34:48 -07:00
Android (Google) Code Review
ad0a7180a9 Merge change 4455 into donut
* changes:
  add feedback test with gsm7bit special case characters
2009-06-17 01:15:08 -07:00
Android (Google) Code Review
112b5faa7e Merge change 4326 into donut
* changes:
  Don't get location in search dialog.
2009-06-17 00:58:19 -07:00
Android (Google) Code Review
cc7d4d68e0 Merge change 4337 into donut
* changes:
  Change the keystore APIs.
2009-06-16 23:35:57 -07:00
Chung-yih Wang
4c40420cd2 Change the keystore APIs.
1. simplify the keypair selection in UI.
2. add the user certificate and key into the keystore for keygen feature.
2009-06-17 14:32:05 +08:00
Android (Google) Code Review
caf7587025 am 8db24105: Merge change 4402 into donut
Merge commit '8db24105cb92c8513ae1ab6adceb1c1caf9c323f'

* commit '8db24105cb92c8513ae1ab6adceb1c1caf9c323f':
  Fixes #1899284 and #1899287. Give applications more control over the gesture's path.
2009-06-16 21:59:18 -07:00
Android (Google) Code Review
91a89592fe am 8ad47399: Merge change 4374 into donut
Merge commit '8ad473994d402e42ec3c8f44f31e99ef2f7e9237'

* commit '8ad473994d402e42ec3c8f44f31e99ef2f7e9237':
  Fixes a potential NPE in View.
2009-06-16 21:59:15 -07:00
Joe Onorato
03aa8d7d04 checkpoint BackupDatAInput / RestoreHelper 2009-06-16 18:46:50 -07:00
Android (Google) Code Review
8c6bd7bf42 Merge change 4426
* changes:
  Switch fountain to use ProgramVertex rather than hard coded camers in scripts.  Remove camera code from scripts.
2009-06-16 17:51:09 -07:00
Android (Google) Code Review
4b4e2b3cdb am febde5fc: Merge change 4389 into donut
Merge commit 'febde5fc290eb422f78b47f393dc451394751d59'

* commit 'febde5fc290eb422f78b47f393dc451394751d59':
  More bmgr work; fix clear-data signalling
2009-06-16 16:43:17 -07:00
Android (Google) Code Review
a230463a5a am f1170fb5: Merge change 4251 into donut
Merge commit 'f1170fb5386ea86d704480d321ee9d1ee4858244'

* commit 'f1170fb5386ea86d704480d321ee9d1ee4858244':
  Updating TTS engine interface for setting the language based on language, country and variant codes
2009-06-16 16:43:11 -07:00
Android (Google) Code Review
4d58d38cc9 am 5633034f: Merge change 4115 into donut
Merge commit '5633034f79bfa67c4219f16fd6d23e962e800be2'

* commit '5633034f79bfa67c4219f16fd6d23e962e800be2':
  * component can be null after destory?
2009-06-16 16:43:01 -07:00
Android (Google) Code Review
4d86bc3791 Merge change 4402 into donut
* changes:
  Fixes #1899284 and #1899287. Give applications more control over the gesture's path.
2009-06-16 15:56:49 -07:00
Android (Google) Code Review
7565e58208 Merge change 4387
* changes:
  beef up the syncadapter API
2009-06-16 15:34:34 -07:00
Android (Google) Code Review
da210b815b Merge change 4374 into donut
* changes:
  Fixes a potential NPE in View.
2009-06-16 15:04:37 -07:00
Android (Google) Code Review
52d51c5f45 Merge change 4389 into donut
* changes:
  More bmgr work; fix clear-data signalling
2009-06-16 14:34:23 -07:00
Android (Google) Code Review
fd666a331d Merge change 4251 into donut
* changes:
  Updating TTS engine interface for setting the language based on language, country and variant codes coming from a java.util.Locale instance.
2009-06-16 14:05:39 -07:00
Jean-Michel Trivi
bc275c818b Updating TTS engine interface for setting the language based on language, country and variant codes
coming from a java.util.Locale instance.
2009-06-16 13:25:15 -07:00
Android (Google) Code Review
aa9c3fdd82 Merge change 4115 into donut
* changes:
  * component can be null after destory?  This was causing NPE in catch block, which hides the actual exception.
2009-06-16 13:14:09 -07:00
Android (Google) Code Review
3be4d83b1c Merge change 4359
* changes:
  Allow proper text editing after clicking with the trackball.
2009-06-16 13:02:50 -07:00
Android (Google) Code Review
ecbcd559f0 am a6061e04: Merge change 2563 into donut
Merge commit 'a6061e043cb6056c303206c2c9870ae3758861f1'

* commit 'a6061e043cb6056c303206c2c9870ae3758861f1':
  Add PDP Reject causes.
2009-06-16 10:30:13 -07:00
Android (Google) Code Review
34b5dfedba Merge change 2563 into donut
* changes:
  Add PDP Reject causes.
2009-06-16 10:28:11 -07:00
Android (Google) Code Review
a14827375e am 653349fe: Merge change 4329 into donut
Merge commit '653349fe48f2995d9e17b5e0a4110925cffdaeab'

* commit '653349fe48f2995d9e17b5e0a4110925cffdaeab':
  Change the first parameter of Keystore.generateKeyPair() to int.
2009-06-16 09:07:56 -07:00
Android (Google) Code Review
b6d1e5b8ec Merge change 4329 into donut
* changes:
  Change the first parameter of Keystore.generateKeyPair() to int.
2009-06-16 09:05:50 -07:00
Android (Google) Code Review
891e3aace9 am 0e3d77af: Merge change 4324 into donut
Merge commit '0e3d77af4ec6cd4961cfb144045ee9dfe479ccf6'

* commit '0e3d77af4ec6cd4961cfb144045ee9dfe479ccf6':
  AudioService: Fix routing problem recently introduced in setRouting().
2009-06-16 08:37:50 -07:00
Android (Google) Code Review
c1c759ac12 am 7f148d65: Merge change 4316 into donut
Merge commit '7f148d65051e577cc4a002183ec55d625b51de85'

* commit '7f148d65051e577cc4a002183ec55d625b51de85':
  Revert "dumpstate: Temporarily disable dumping /proc/slabinfo to avoid kernel crash."
  Enable more debug message to debug the Camera startPreview bug.
2009-06-16 08:37:35 -07:00
Android (Google) Code Review
0cc76d2ab9 am 8742e120: Merge change 4311 into donut
Merge commit '8742e120608328e2505f15903a33e538e68bd519'

* commit '8742e120608328e2505f15903a33e538e68bd519':
  Add keygen API to Keystore.
2009-06-16 08:37:33 -07:00
Android (Google) Code Review
168f3c5201 am b4f7592b: Merge change 4299 into donut
Merge commit 'b4f7592b03c8424302c10e61474b0e2d0a71a630'

* commit 'b4f7592b03c8424302c10e61474b0e2d0a71a630':
  Allow pre-Donut apps to use indirect Buffers in GL11 Pointer methods.
  Fix IntentFilter constructor to properly process the action parameter.
2009-06-16 08:37:21 -07:00
Android (Google) Code Review
cebf1551fc am 6297cb2e: Merge change 4287 into donut
Merge commit '6297cb2eb57c183e202744516a96b2dbbf204a09'

* commit '6297cb2eb57c183e202744516a96b2dbbf204a09':
  Sketch out a 'bmgr' command line tool
2009-06-16 08:37:18 -07:00
Dianne Hackborn
3d4fb92a7f am 4ebd855b: Fix build.
Merge commit '4ebd855bb7362d45833dc811f2622fcc788dec17'

* commit '4ebd855bb7362d45833dc811f2622fcc788dec17':
  Fix build.
2009-06-16 08:37:05 -07:00
Android (Google) Code Review
538c168b30 am e65fdfb8: Merge change 4262 into donut
Merge commit 'e65fdfb8affd92b3bb2d41f0bd149f704ec48f26'

* commit 'e65fdfb8affd92b3bb2d41f0bd149f704ec48f26':
  Add utility methods to AndroidTestCase for asserting permission requirements for launching activities and accessing ContentProviders.
2009-06-16 08:36:56 -07:00
Android (Google) Code Review
56f03a51e9 am 727f36c6: Merge change 4265 into donut
Merge commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef'

* commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef':
  process: Fix bug where if a thread exited while we were changing its control
  Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
2009-06-16 08:36:48 -07:00
Android (Google) Code Review
913e8717e9 am 3dcea047: Merge change 4237 into donut
Merge commit '3dcea047c5c7a61a56f618815e298d7bd38e2678'

* commit '3dcea047c5c7a61a56f618815e298d7bd38e2678':
  Remove obsolete FOTA_UPDATE permission (which should never have been
2009-06-16 08:36:35 -07:00
Grace Kloba
cc4e622a62 am a03f0465: hide the new constant as it is pending api approval
Merge commit 'a03f046522f568a79b75556aa54c0407b1151511'

* commit 'a03f046522f568a79b75556aa54c0407b1151511':
  hide the new constant as it is pending api approval
2009-06-16 08:36:26 -07:00