Commit Graph

4712 Commits

Author SHA1 Message Date
Ye Wen
2b4c95269e am 9399a3de: Merge change 23320 into eclair
Merge commit '9399a3de6acb6e598fdceae2684ff9bb9d8c1050' into eclair-plus-aosp

* commit '9399a3de6acb6e598fdceae2684ff9bb9d8c1050':
  Set result code in REMOTE_INTENT receiver for subscribed feeds.
2009-08-31 13:56:23 -07:00
Android (Google) Code Review
4808daff0c Merge change 23320 into eclair
* changes:
  Set result code in REMOTE_INTENT receiver for subscribed feeds.
2009-08-31 13:54:11 -07:00
Yu Shan Emily Lau
3f2ea0cefe am 52d6245b: Merge change 22995 into eclair
Merge commit '52d6245ba2454eab456d609d065283dfa76e8c79' into eclair-plus-aosp

* commit '52d6245ba2454eab456d609d065283dfa76e8c79':
  modified:   res/layout/surface_view.xml
2009-08-31 12:10:07 -07:00
Android (Google) Code Review
c5f021921b Merge change 22995 into eclair
* changes:
  	modified:   res/layout/surface_view.xml 	modified:   src/com/android/mediaframeworktest/MediaFrameworkTest.java 	modified:   src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java         Fixed the async mp3 playback test case and also switch the base activity to full screen.
2009-08-31 12:07:07 -07:00
Daniel Sandler
ccac61d143 am de5cd3d8: Merge change 23289 into eclair
Merge commit 'de5cd3d8646f312987062f46616466ae191aa984' into eclair-plus-aosp

* commit 'de5cd3d8646f312987062f46616466ae191aa984':
  Fix http://b/issue?id=2086835 (unlock pattern graphics misaligned).
2009-08-31 10:09:22 -07:00
Android (Google) Code Review
5579b7fc70 Merge change 23289 into eclair
* changes:
  Fix http://b/issue?id=2086835 (unlock pattern graphics misaligned).
2009-08-31 10:07:10 -07:00
Eric Laurent
624cf24ca5 am f7c7a67d: Merge change 23277 into eclair
Merge commit 'f7c7a67d9b223f92e1884a82d49714cb71ee7d37' into eclair-plus-aosp

* commit 'f7c7a67d9b223f92e1884a82d49714cb71ee7d37':
  Fix issue 2085690: AudioFlinger must properly terminate the input and output threads when destroyed.
2009-08-31 09:40:50 -07:00
Jean-Baptiste Queru
3824299bd1 am 3ad34cac: am 57f03f0b: Merge snapshot version of donut back into the main tree
Merge commit '3ad34cacbc7b990bbe11d90e89c2b50667148d33' into eclair-plus-aosp

* commit '3ad34cacbc7b990bbe11d90e89c2b50667148d33':
  donut snapshot
2009-08-31 09:39:21 -07:00
Android (Google) Code Review
52efda85a7 Merge change 23277 into eclair
* changes:
  Fix issue 2085690: AudioFlinger must properly terminate the input and output threads when destroyed.
2009-08-31 09:38:56 -07:00
Jean-Baptiste Queru
87bd2160c9 am 57f03f0b: Merge snapshot version of donut back into the main tree
Merge commit '57f03f0b5d0228799111651aa6915f7d837d501e' into eclair

* commit '57f03f0b5d0228799111651aa6915f7d837d501e':
  donut snapshot
2009-08-31 09:37:32 -07:00
Jean-Baptiste Queru
9582a469c9 Merge snapshot version of donut back into the main tree 2009-08-31 09:32:35 -07:00
Dmitri Plotnikov
454f646812 am f35bce45: Adding a column to Contacts, which will be used as an additional "soft" identity.
Merge commit 'f35bce45058200ff1209385e63e34fbf59255db6' into eclair-plus-aosp

* commit 'f35bce45058200ff1209385e63e34fbf59255db6':
  Adding a column to Contacts, which will be used as an additional "soft" identity.
2009-08-31 09:22:30 -07:00
Jean-Baptiste Queru
f70254c57c donut snapshot 2009-08-31 09:17:57 -07:00
Eric Laurent
c80b1a0034 Fix issue 2085690: AudioFlinger must properly terminate the input and output threads when destroyed.
Call closeInput() for all inputs and closeOutput() for all outputs before deleting audio hardware in AudioFlinger destructor.
2009-08-31 02:10:20 -07:00
Fred Quintana
8c22879556 am 66360af8: Merge change 23266 into eclair
Merge commit '66360af891ac1b77fa5a48d668bd848c84b6f041' into eclair-plus-aosp

* commit '66360af891ac1b77fa5a48d668bd848c84b6f041':
  disable canceling until the http connection code is understood
2009-08-31 00:24:59 -07:00
Android (Google) Code Review
392f61b0fc Merge change 23266 into eclair
* changes:
  disable canceling until the http connection code is understood
2009-08-31 00:22:42 -07:00
Joe Onorato
fae215aa77 am 56d8eeae: applications are at level 2
Merge commit '56d8eeae6f863771d759448d45f7ce75aef73b21' into eclair-plus-aosp

* commit '56d8eeae6f863771d759448d45f7ce75aef73b21':
  applications are at level 2
2009-08-30 16:57:46 -07:00
Joe Onorato
30487fbd04 am 1553c82e: Add a flag (-G) to aapt to have it output the classes that shouldn\'t be obfuscated by ProGuard.
Merge commit '1553c82e084ac5763fb393857224145506771b99' into eclair-plus-aosp

* commit '1553c82e084ac5763fb393857224145506771b99':
  Add a flag (-G) to aapt to have it output the classes that shouldn't be obfuscated by ProGuard.
2009-08-30 16:57:41 -07:00
Mike Lockwood
71d28c3e40 am b0a05404: Merge change 23223 into eclair
Merge commit 'b0a054048329c31948c2f5dbcc11b6f99e454177' into eclair-plus-aosp

* commit 'b0a054048329c31948c2f5dbcc11b6f99e454177':
  SensorService: call close_data_source when we have no more sensor clients.
2009-08-30 13:36:17 -07:00
Android (Google) Code Review
13dc47748e Merge change 23223 into eclair
* changes:
  SensorService: call close_data_source when we have no more sensor clients.
2009-08-30 13:33:57 -07:00
Mike Lockwood
5761b40696 am 2d93a116: Merge change 23187 into eclair
Merge commit '2d93a11663d1d872bc7e9d6512a445fa84148583' into eclair-plus-aosp

* commit '2d93a11663d1d872bc7e9d6512a445fa84148583':
  Do not send dock state changed broadcasts until the system has finished booting.
2009-08-30 12:03:24 -07:00
Android (Google) Code Review
524fef60ff Merge change 23187 into eclair
* changes:
  Do not send dock state changed broadcasts until the system has finished booting.
2009-08-30 12:02:07 -07:00
Dianne Hackborn
5b9fded0b9 am f810d1a8: Put vibration patterns in resources.
Merge commit 'f810d1a88b2d3166064c4a36d8cc9314f02094e0' into eclair-plus-aosp

* commit 'f810d1a88b2d3166064c4a36d8cc9314f02094e0':
  Put vibration patterns in resources.
2009-08-30 11:08:50 -07:00
Dianne Hackborn
014c5cd98e am 284ac93a: More work on wallpapers: animations, lifecycle, scaling, etc.
Merge commit '284ac93aa30642fda87d5c40263a1263677c21cd' into eclair-plus-aosp

* commit '284ac93aa30642fda87d5c40263a1263677c21cd':
  More work on wallpapers: animations, lifecycle, scaling, etc.
2009-08-30 10:57:59 -07:00
Jeff Sharkey
9b0c0c2e23 am cfff8f22: Merge change 23244 into eclair
Merge commit 'cfff8f2291881acb3b3400cd2a0f644c451c2f53' into eclair-plus-aosp

* commit 'cfff8f2291881acb3b3400cd2a0f644c451c2f53':
  Add mobile Email type.
2009-08-29 15:57:04 -07:00
Android (Google) Code Review
8f63637101 Merge change 23244 into eclair
* changes:
  Add mobile Email type.
2009-08-29 15:55:12 -07:00
Scott Main
ba041e46b5 am d2227277: am a84a26d2: Merge change 23241 into donut
Merge commit 'd2227277d405fc368c1baf1a80c2d600dca96145' into eclair-plus-aosp

* commit 'd2227277d405fc368c1baf1a80c2d600dca96145':
  add searchable dictionary to html docs and dev guide nav
2009-08-29 13:43:32 -07:00
Scott Main
e4a4566fbf am a84a26d2: Merge change 23241 into donut
Merge commit 'a84a26d2afab503ed32e6ecc94acba46a5eb9eb3' into eclair

* commit 'a84a26d2afab503ed32e6ecc94acba46a5eb9eb3':
  add searchable dictionary to html docs and dev guide nav
2009-08-29 13:40:53 -07:00
Android (Google) Code Review
7b06c7a416 Merge change 23241 into donut
* changes:
  add searchable dictionary to html docs and dev guide nav and add screenshots.
2009-08-29 13:38:17 -07:00
Fred Quintana
da9a86fd19 am 56f67d21: add the ability to specify yieldpoints in a ContentProviderOperation
Merge commit '56f67d21459ad3f136c73c8932904d4a495989c0' into eclair-plus-aosp

* commit '56f67d21459ad3f136c73c8932904d4a495989c0':
  add the ability to specify yieldpoints in a ContentProviderOperation
2009-08-28 17:04:07 -07:00
Mike LeBeau
0e3fc09e21 am cc927375: am af0b780a: Merge change 23198 into donut
Merge commit 'cc927375cea38f44d810d9dd5ba87abb624d7e0c' into eclair-plus-aosp

* commit 'cc927375cea38f44d810d9dd5ba87abb624d7e0c':
  Update SearchManager documentation to reflect latest behavior.
2009-08-28 16:17:54 -07:00
Mike LeBeau
0a257d15d3 am af0b780a: Merge change 23198 into donut
Merge commit 'af0b780ac6305eb6b6795cb8139ae051e13dd7ff' into eclair

* commit 'af0b780ac6305eb6b6795cb8139ae051e13dd7ff':
  Update SearchManager documentation to reflect latest behavior.
2009-08-28 16:15:58 -07:00
Android (Google) Code Review
8efb42692d Merge change 23198 into donut
* changes:
  Update SearchManager documentation to reflect latest behavior.
2009-08-28 16:14:21 -07:00
Robert Greenwalt
4d01dd75b5 am 6ce96faa: Don\'t mark an APN disabled if setup fails
Merge commit '6ce96faa0c8dc74ea6d1391aa54d9c6909810dc1' into eclair-plus-aosp

* commit '6ce96faa0c8dc74ea6d1391aa54d9c6909810dc1':
  Don't mark an APN disabled if setup fails
2009-08-28 14:39:49 -07:00
Yong Liu
ad38a42932 am 616195a3: Merge change 23182 into eclair
Merge commit '616195a3b3a50b4f504806cea629af2fe34ae953' into eclair-plus-aosp

* commit '616195a3b3a50b4f504806cea629af2fe34ae953':
  MO SMS fail after sending 100 messages
2009-08-28 14:18:53 -07:00
Android (Google) Code Review
047784f437 Merge change 23182 into eclair
* changes:
  MO SMS fail after sending 100 messages
2009-08-28 14:04:38 -07:00
Brett Chabot
b04c5438cc am 1615ccc8: am e1df8224: Merge change 23173 into donut
Merge commit '1615ccc8a45ea2521339ae6f5b5d543a131915cf' into eclair-plus-aosp

* commit '1615ccc8a45ea2521339ae6f5b5d543a131915cf':
  Remove flaky test LifecycleTest.testDialog from large continuous suite.
2009-08-28 13:52:53 -07:00
Brett Chabot
ad962cd01c am e1df8224: Merge change 23173 into donut
Merge commit 'e1df82248a68282a4d556ce61db09949fc186827' into eclair

* commit 'e1df82248a68282a4d556ce61db09949fc186827':
  Remove flaky test LifecycleTest.testDialog from large continuous suite.
2009-08-28 13:50:16 -07:00
Android (Google) Code Review
f10650b07e Merge change 23173 into donut
* changes:
  Remove flaky test LifecycleTest.testDialog from large continuous suite.
2009-08-28 13:48:09 -07:00
Andreas Huber
ef90be4ffc am 421f5f71: Merge change 23169 into eclair
Merge commit '421f5f71363a40e2d5bc7633b7faeb6b9bfc9fbe' into eclair-plus-aosp

* commit '421f5f71363a40e2d5bc7633b7faeb6b9bfc9fbe':
  More assert => CHECK
2009-08-28 13:36:34 -07:00
Charles Chen
171aa7356e am e8e4c7e4: Merge change 23127 into eclair
Merge commit 'e8e4c7e4fa6e936eb14bc6c4658c19a1f52f5f59' into eclair-plus-aosp

* commit 'e8e4c7e4fa6e936eb14bc6c4658c19a1f52f5f59':
  Fixing bug 2086021. AccessiblityService could sometimes get a null pointer
2009-08-28 13:36:30 -07:00
Android (Google) Code Review
b7621935e2 Merge change 23169 into eclair
* changes:
  More assert => CHECK
2009-08-28 13:35:25 -07:00
Android (Google) Code Review
6b47ad3d2a Merge change 23127 into eclair
* changes:
  Fixing bug 2086021. AccessiblityService could sometimes get a null pointer exception if multiple accessibility services are running and there are several events all happening within a short period of time.
2009-08-28 13:34:38 -07:00
Mike Lockwood
7477299609 am 9e6842ca: Merge change 23168 into eclair
Merge commit '9e6842caa8334f78744dee77d476ac6eec5b7540' into eclair-plus-aosp

* commit '9e6842caa8334f78744dee77d476ac6eec5b7540':
  EventHub: Fix file descriptor leak.
2009-08-28 13:32:58 -07:00
Andreas Huber
845ea64f69 am 4b027f12: Merge change 23165 into eclair
Merge commit '4b027f128fea32bfcabee55bf4d994400453c00c' into eclair-plus-aosp

* commit '4b027f128fea32bfcabee55bf4d994400453c00c':
  Fixes a race condition between entering ERROR state and initial buffer submit.
2009-08-28 13:32:54 -07:00
Wink Saville
2254b89290 am b699013a: Merge change 22940 into eclair
Merge commit 'b699013a57b1973694896731f7a05b955e4720c4' into eclair-plus-aosp

* commit 'b699013a57b1973694896731f7a05b955e4720c4':
  Fix bug 2040024 phone rings only once sometimes.
2009-08-28 13:32:49 -07:00
Android (Google) Code Review
2a0ad3081b Merge change 23168 into eclair
* changes:
  EventHub: Fix file descriptor leak.
2009-08-28 13:31:28 -07:00
Android (Google) Code Review
f0baeefc75 Merge change 23165 into eclair
* changes:
  Fixes a race condition between entering ERROR state and initial buffer submit.
2009-08-28 13:30:51 -07:00
Android (Google) Code Review
98b64ad966 Merge change 22940 into eclair
* changes:
  Fix bug 2040024 phone rings only once sometimes.
2009-08-28 13:30:18 -07:00
Mike Lockwood
07549f984d EventHub: Fix file descriptor leak.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-28 13:30:03 -07:00