Commit Graph

40764 Commits

Author SHA1 Message Date
Amith Yamasani
d4a8083581 Merge "Close suggestions cursor when SearchView is detached." into ics-mr1 2011-11-04 10:41:10 -07:00
Flavio Lerda
47f3f725d0 Merge "Add a query parameter to look-up a SIP address." into ics-mr1 2011-11-04 09:48:18 -07:00
Eric Laurent
e2c4e9ba66 Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1 2011-11-04 08:29:30 -07:00
Eric Laurent
44d5fa3aa5 Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1 2011-11-04 08:27:45 -07:00
The Android Open Source Project
71d2a87466 am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '8242cc49a90aa13a4830a735438b6e3cf73ea0f0':
  Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
  Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
  Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
2011-11-04 15:01:30 +00:00
The Android Open Source Project
2009c2f06c Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I81cf3b3994cb9a1c18fca3ce0049e09402543086
2011-11-04 07:56:43 -07:00
Wink Saville
c20a7f1a18 am 9ca0f122: am e4ca9242: Fix the build.
* commit '9ca0f1222711b4cce1de56c6623790165870392a':
  Fix the build.
2011-11-04 12:04:09 +00:00
Dave Burke
d40e8d7923 am 43e72b1f: (-s ours) am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
* commit '43e72b1f5692dd9e220158001317c2abc0ecafcf':
  DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
2011-11-04 12:04:08 +00:00
Wink Saville
e71d620d70 am 8b771243: am 3d708451: Merge "Separate data stall detection and recovery from net stats." into ics-mr0
* commit '8b77124395713de5e09c9b56fac03c244513dc25':
  Separate data stall detection and recovery from net stats.
2011-11-04 12:04:06 +00:00
Wink Saville
ee0e44271a am e4ca9242: Fix the build.
* commit 'e4ca92421cc07c2f7f152b774dd1ac7a8944028b':
  Fix the build.
2011-11-04 11:59:29 +00:00
Dave Burke
14c82e0af9 am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
* commit '32b5a7eeaf758fad0c24131603cdd54cd2883a58':
  DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
2011-11-04 11:59:27 +00:00
Wink Saville
e0d02e00bf am 3d708451: Merge "Separate data stall detection and recovery from net stats." into ics-mr0
* commit '3d7084519b03da0681da13fb8d7d4a0914d11646':
  Separate data stall detection and recovery from net stats.
2011-11-04 11:59:25 +00:00
Katie McCormick
dc2361e84f am 6d77ad80: am 6c5951bf: Doc change: Updating device-admin with camera info.
* commit '6d77ad80375a82b97aefb7d5ab547a2944135edf':
  Doc change: Updating device-admin with camera info.
2011-11-04 11:34:16 +00:00
Katie McCormick
f4af7e7467 am 6c5951bf: Doc change: Updating device-admin with camera info.
* commit '6c5951bf9798369d335096f1f73ee1299cf903ff':
  Doc change: Updating device-admin with camera info.
2011-11-04 11:28:39 +00:00
Ken Wakasa
993ec1c38d am 943f6d0b: Merge "Turn off the spell checker when the spell checker is disabled in the settings" into ics-mr1
* commit '943f6d0b33f599ed00b76c59b4a4b4c41d0e66f2':
  Turn off the spell checker when the spell checker is disabled in the settings
2011-11-04 08:05:44 +00:00
Ken Wakasa
6d52d9c26c Merge "Turn off the spell checker when the spell checker is disabled in the settings" into ics-mr1 2011-11-04 01:02:12 -07:00
Dave Burke
e11ccb28d1 Merge "DO NOT MERGE Poll input data with a small timeout and don't consume a full core." into ics-mr0 2011-11-03 21:59:20 -07:00
Wink Saville
de6499254b Merge "Separate data stall detection and recovery from net stats." into ics-mr0 2011-11-03 21:26:35 -07:00
Jeff Brown
2ab79e755b Slight change to the unwinder API.
Change-Id: I5424de76a21b74842e004e0281936b3f492d3c7a
2011-11-03 17:30:54 -07:00
Irfan Sheriff
8f260bafc0 am a3d9eba1: Merge "Reset IP failure counter on a success" into ics-mr1
* commit 'a3d9eba10461158a52acfc2a0324696b25db761f':
  Reset IP failure counter on a success
2011-11-03 23:10:04 +00:00
Irfan Sheriff
c5e0f4ff35 Merge "Reset IP failure counter on a success" into ics-mr1 2011-11-03 16:06:07 -07:00
Christopher Tate
632d904941 am 4fdad1af: Merge "Add persistent property to disable strict mode" into ics-mr1
* commit '4fdad1af53ea46892f477185ff93d4182b7aadf9':
  Add persistent property to disable strict mode
2011-11-03 23:04:43 +00:00
Christopher Tate
59c37194bb Merge "Add persistent property to disable strict mode" into ics-mr1 2011-11-03 15:59:47 -07:00
Mangesh Ghiware
fc109ad55e am 69957172: Merge "Update fix to restore view and text wrap scales." into ics-mr1
* commit '69957172fa8336e01a9ff07ab34deca2c553f0b4':
  Update fix to restore view and text wrap scales.
2011-11-03 22:40:56 +00:00
Mangesh Ghiware
233691c340 Merge "Update fix to restore view and text wrap scales." into ics-mr1 2011-11-03 15:35:23 -07:00
Dianne Hackborn
ad2bff5100 am e0ad4746: Merge "Some optimizations for view inflation." into ics-mr1
* commit 'e0ad47465ededb16c6cd60524acd6941a8ce0bd8':
  Some optimizations for view inflation.
2011-11-03 22:19:36 +00:00
Dianne Hackborn
fd5178892c Merge "Some optimizations for view inflation." into ics-mr1 2011-11-03 15:16:11 -07:00
Kenny Root
ff2759d80f am e24ac4b2: Merge "Update GET_UNINSTALLED_PACKAGES flag documentation" into ics-mr1
* commit 'e24ac4b219a582f1a99465551b1fd76345553b22':
  Update GET_UNINSTALLED_PACKAGES flag documentation
2011-11-03 21:51:15 +00:00
Kenny Root
251d5b274f Merge "Update GET_UNINSTALLED_PACKAGES flag documentation" into ics-mr1 2011-11-03 14:47:07 -07:00
Scott Main
c3329679a5 am cbf1437c: am 95142919: docs: dashboard update for 11/3
* commit 'cbf1437c9dc3080d4faa79be8612c3ef7387515e':
  docs: dashboard update for 11/3
2011-11-03 21:10:49 +00:00
Scott Main
e5aa119222 am 95142919: docs: dashboard update for 11/3
* commit '9514291901e3a1274e30c2e809ad38e22e7f662e':
  docs: dashboard update for 11/3
2011-11-03 21:06:29 +00:00
Marco Nelissen
e72e78cc78 am f51f1bd9: Verify we actually have valid utf8 metadata
* commit 'f51f1bd9d42d0dd55c120bfb83ed113b61e5c3ca':
  Verify we actually have valid utf8 metadata
2011-11-03 20:18:37 +00:00
Jamie Gennis
eade85c60c am c5ce130f: Merge "SurfaceTexture: various logging improvements" into ics-mr1
* commit 'c5ce130f658303299bf55091373951f7fd33ae36':
  SurfaceTexture: various logging improvements
2011-11-03 18:57:21 +00:00
Jamie Gennis
7fbb39960e am 236aea35: Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1
* commit '236aea3579787961fdd41d87574760b63323c0c1':
  BlobCache: implement cache serialization
  BlobCache: remove the mutex locking
2011-11-03 18:55:14 +00:00
Jamie Gennis
9f8b1cecc8 Merge "SurfaceTexture: various logging improvements" into ics-mr1 2011-11-03 11:51:38 -07:00
Jamie Gennis
3aed920fcc Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1
* changes:
  BlobCache: implement cache serialization
  BlobCache: remove the mutex locking
2011-11-03 11:51:23 -07:00
Jeff Sharkey
464f048cdd am 3f9ce4c2: Merge "Verify AppWidget ownership during update." into ics-mr1
* commit '3f9ce4c22ae9b4f0f2208c29f8c93d6ad652a1dc':
  Verify AppWidget ownership during update.
2011-11-03 18:49:05 +00:00
Teng-Hui Zhu
976b5f23ce am 76b06759: Merge "Create GL texture when it is missing for video layer" into ics-mr1
* commit '76b067590b2e9dc403c9edac58e414468c5e1104':
  Create GL texture when it is missing for video layer
2011-11-03 18:46:41 +00:00
Jeff Sharkey
6534d369b7 Merge "Verify AppWidget ownership during update." into ics-mr1 2011-11-03 11:43:52 -07:00
Teng-Hui Zhu
a32ea7fea7 Merge "Create GL texture when it is missing for video layer" into ics-mr1 2011-11-03 11:43:16 -07:00
Andreas Huber
3bbb42ae08 am e395f645: Poll input data with a small timeout and don\'t consume a full core.
* commit 'e395f645aa4c30a4fad8beb3da6f8fad72338617':
  Poll input data with a small timeout and don't consume a full core.
2011-11-03 18:12:39 +00:00
Eric Laurent
2bb8b969ba am 1f85f1dc: Merge "Remove unreliable effect tests." into ics-mr1
* commit '1f85f1dc6ebe3c79ce753f0f9c2f9fa7f29f493d':
  Remove unreliable effect tests.
2011-11-03 15:49:16 +00:00
Eric Laurent
3f13dd0648 Merge "Remove unreliable effect tests." into ics-mr1 2011-11-03 08:45:43 -07:00
The Android Automerger
f60565f965 merge in ics-mr1-release history after reset to ics-mr1 2011-11-03 06:44:18 -07:00
The Android Automerger
fd4f0cdc3a merge in ics-mr0-release history after reset to ics-mr0 2011-11-03 06:33:29 -07:00
Daniel Sandler
76fee3ce26 am 1f42a3db: Merge "Bring back Android Dreams." into ics-mr1
* commit '1f42a3db9e09138f92e8eb16c35cf50e92a88a46':
  Bring back Android Dreams.
2011-11-03 10:59:54 +00:00
Daniel Sandler
8b82413ffa Merge "Bring back Android Dreams." into ics-mr1 2011-11-03 03:56:49 -07:00
satok
8ab5c28b37 am cb1001b2: Merge "Fix a memory leak of a Binder in SpellCheckerService" into ics-mr1
* commit 'cb1001b2829f7da86f66f2634bd40cbc51ba4998':
  Fix a memory leak of a Binder in SpellCheckerService
2011-11-03 09:13:13 +00:00
satok
73eb27d22c Merge "Fix a memory leak of a Binder in SpellCheckerService" into ics-mr1 2011-11-03 02:09:32 -07:00
Jeff Sharkey
932cc2e5a0 am 808ee95d: Merge "Correct proc file reader, optimizations." into ics-mr1
* commit '808ee95dd4244da6ae767d3ddd003ed7b48937d0':
  Correct proc file reader, optimizations.
2011-11-03 07:36:03 +00:00