Commit Graph

15467 Commits

Author SHA1 Message Date
Neal Nguyen
ad5aeb88a4 am 0c817ba3: am 27e5a95a: am 5fa65082: Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo 2010-04-23 14:36:17 -07:00
Dianne Hackborn
aba26a8ba4 am 994e3990: am 2adec762: Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo
Merge commit '994e39908b167fb70883ce6c1146433e0486e86f' into kraken

* commit '994e39908b167fb70883ce6c1146433e0486e86f':
  Fix issue #2621809: Kill! Kill! Kill!
2010-04-23 14:28:52 -07:00
Neal Nguyen
a4c0e8f248 am 27e5a95a: am 5fa65082: Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo
Merge commit '27e5a95afc10faca6314f9b710f07e8f99b3311f' into kraken

* commit '27e5a95afc10faca6314f9b710f07e8f99b3311f':
  Re-enabling unit tests for PackageManager/Apps on SD.
2010-04-23 14:28:48 -07:00
Dianne Hackborn
dd75ae71a0 am 2adec762: Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo
Merge commit '2adec762fbb61c73f612acb7463ba765de1296ad' into froyo-plus-aosp

* commit '2adec762fbb61c73f612acb7463ba765de1296ad':
  Fix issue #2621809: Kill! Kill! Kill!
2010-04-23 14:25:05 -07:00
Neal Nguyen
6b9fa2b713 am 5fa65082: Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo
Merge commit '5fa65082f16741394dcfbe756e3880d5c018dace' into froyo-plus-aosp

* commit '5fa65082f16741394dcfbe756e3880d5c018dace':
  Re-enabling unit tests for PackageManager/Apps on SD.
2010-04-23 14:25:01 -07:00
Dianne Hackborn
ddf83ba28c Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo 2010-04-23 14:23:39 -07:00
Neal Nguyen
bc33726ea9 Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo 2010-04-23 14:21:53 -07:00
Robert Greenwalt
7a4fcd50b4 am 9ef25759: am b6c770e4: am 0b2ebe9b: Merge "Respond to changes in throttle policy." into froyo 2010-04-23 14:02:31 -07:00
Robert Greenwalt
01265a73ec am b6c770e4: am 0b2ebe9b: Merge "Respond to changes in throttle policy." into froyo
Merge commit 'b6c770e4e387bd73d4e7d4cbad99079b37f59043' into kraken

* commit 'b6c770e4e387bd73d4e7d4cbad99079b37f59043':
  Respond to changes in throttle policy.
2010-04-23 13:55:05 -07:00
Robert Greenwalt
37d3dc06b6 am 0b2ebe9b: Merge "Respond to changes in throttle policy." into froyo
Merge commit '0b2ebe9b45172b9147f86fd69eedb2a200982b68' into froyo-plus-aosp

* commit '0b2ebe9b45172b9147f86fd69eedb2a200982b68':
  Respond to changes in throttle policy.
2010-04-23 13:52:18 -07:00
Robert Greenwalt
2e909fffdc Merge "Respond to changes in throttle policy." into froyo 2010-04-23 13:50:03 -07:00
Steve Block
ba4956ddda Merge "Updates DumpRenderTree ignore list to reflect status of touch event tests at current WebKit revision (r54731)." 2010-04-23 13:39:07 -07:00
Dianne Hackborn
cc4aa23654 am 0c1be50f: am dc14dc6d: am bf73bbff: Merge "Some debugging help for issue #2594388" into froyo 2010-04-23 13:12:47 -07:00
Dianne Hackborn
f50d849da8 am dc14dc6d: am bf73bbff: Merge "Some debugging help for issue #2594388" into froyo
Merge commit 'dc14dc6d60675be688c333bbc60a315d2c658054' into kraken

* commit 'dc14dc6d60675be688c333bbc60a315d2c658054':
  Some debugging help for issue #2594388
2010-04-23 13:06:02 -07:00
Dianne Hackborn
cde3f26b63 am bf73bbff: Merge "Some debugging help for issue #2594388" into froyo
Merge commit 'bf73bbffc18f5abb5350fa3a410830c05ad10206' into froyo-plus-aosp

* commit 'bf73bbffc18f5abb5350fa3a410830c05ad10206':
  Some debugging help for issue #2594388
2010-04-23 13:02:29 -07:00
Dianne Hackborn
db62452136 Merge "Some debugging help for issue #2594388" into froyo 2010-04-23 12:59:47 -07:00
Vasu Nori
901f24f828 Merge "fix a bug introduced when prepared-statement cache was made LRU-based" 2010-04-23 11:52:34 -07:00
Robert Greenwalt
d1e9b02d46 am d066e3c2: am 1b5a9c5d: am 251ccef0: Merge "Add a Throttle check shortly after boot." into froyo 2010-04-23 10:31:47 -07:00
Robert Greenwalt
d3807fb4ef am 1b5a9c5d: am 251ccef0: Merge "Add a Throttle check shortly after boot." into froyo
Merge commit '1b5a9c5d2fdf353d12ef1ca11dafc78f4c6f6c81' into kraken

* commit '1b5a9c5d2fdf353d12ef1ca11dafc78f4c6f6c81':
  Add a Throttle check shortly after boot.
2010-04-23 10:24:24 -07:00
Robert Greenwalt
d77daac640 am 251ccef0: Merge "Add a Throttle check shortly after boot." into froyo
Merge commit '251ccef0445d4456809bfc41a6344e2dae24f2c3' into froyo-plus-aosp

* commit '251ccef0445d4456809bfc41a6344e2dae24f2c3':
  Add a Throttle check shortly after boot.
2010-04-23 10:20:37 -07:00
Robert Greenwalt
41e202245b Merge "Add a Throttle check shortly after boot." into froyo 2010-04-23 10:17:14 -07:00
Wei Huang
96cc1a1670 am d54c48b2: am 9666bbdf: am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo 2010-04-22 16:47:17 -07:00
Wei Huang
7b956cc02c am 9666bbdf: am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo
Merge commit '9666bbdf1bb96dbf42b88443ad042e63971bfb4a' into kraken

* commit '9666bbdf1bb96dbf42b88443ad042e63971bfb4a':
  bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.
2010-04-22 16:41:17 -07:00
Dianne Hackborn
c9f8318b28 am e06c1e38: am 4bcdd6b0: am 90c6aec1: Merge "Fix issue #2619247: Music sometimes stops playing when navigation talks" into froyo 2010-04-22 16:38:14 -07:00
Dianne Hackborn
f22988f610 am 2fe441fa: am 476a57e6: am 9bc0a572: Merge "Fix issue #2608292: Fails to launch the video camera preview" into froyo 2010-04-22 16:38:10 -07:00
Wei Huang
6ece8383ec am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo
Merge commit '7b88af679a9a3b5737343bb996ef392b76d19e73' into froyo-plus-aosp

* commit '7b88af679a9a3b5737343bb996ef392b76d19e73':
  bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.
2010-04-22 16:35:56 -07:00
Wei Huang
411b51f1f1 Merge "bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug." into froyo 2010-04-22 16:33:40 -07:00
Dianne Hackborn
a4a0502342 am 4bcdd6b0: am 90c6aec1: Merge "Fix issue #2619247: Music sometimes stops playing when navigation talks" into froyo
Merge commit '4bcdd6b0688735d7da0eb2a4f211b4b4c8911e3b' into kraken

* commit '4bcdd6b0688735d7da0eb2a4f211b4b4c8911e3b':
  Fix issue #2619247: Music sometimes stops playing when navigation talks
2010-04-22 16:30:01 -07:00
Dianne Hackborn
27d6a25bc2 am 476a57e6: am 9bc0a572: Merge "Fix issue #2608292: Fails to launch the video camera preview" into froyo
Merge commit '476a57e64a7fa7143e434c1064df1fa87fe4b01a' into kraken

* commit '476a57e64a7fa7143e434c1064df1fa87fe4b01a':
  Fix issue #2608292: Fails to launch the video camera preview
2010-04-22 16:29:56 -07:00
Dianne Hackborn
c1353e2873 am 90c6aec1: Merge "Fix issue #2619247: Music sometimes stops playing when navigation talks" into froyo
Merge commit '90c6aec10f969acf9b171b82920480fb6aeb007f' into froyo-plus-aosp

* commit '90c6aec10f969acf9b171b82920480fb6aeb007f':
  Fix issue #2619247: Music sometimes stops playing when navigation talks
2010-04-22 16:26:59 -07:00
Dianne Hackborn
0bc7251d3a am 9bc0a572: Merge "Fix issue #2608292: Fails to launch the video camera preview" into froyo
Merge commit '9bc0a572d8459e0b6209e8a68cb680389c1f8b73' into froyo-plus-aosp

* commit '9bc0a572d8459e0b6209e8a68cb680389c1f8b73':
  Fix issue #2608292: Fails to launch the video camera preview
2010-04-22 16:24:08 -07:00
Dianne Hackborn
c4384ad5c7 Merge "Fix issue #2619247: Music sometimes stops playing when navigation talks" into froyo 2010-04-22 16:23:44 -07:00
Dianne Hackborn
f78357eb2b Merge "Fix issue #2608292: Fails to launch the video camera preview" into froyo 2010-04-22 16:20:19 -07:00
Suchi Amalapurapu
e74db3aa5b am db2e6159: am a298d6fd: am a2a568e5: Merge "Fix error code when media is filled up." into froyo 2010-04-22 16:05:05 -07:00
Suchi Amalapurapu
7c4f81b0d3 am a298d6fd: am a2a568e5: Merge "Fix error code when media is filled up." into froyo
Merge commit 'a298d6fd2a920e8ff2dfd5fd03a2f95cbce5451f' into kraken

* commit 'a298d6fd2a920e8ff2dfd5fd03a2f95cbce5451f':
  Fix error code when media is filled up.
2010-04-22 15:57:34 -07:00
Suchi Amalapurapu
81f09d8d54 am a2a568e5: Merge "Fix error code when media is filled up." into froyo
Merge commit 'a2a568e58d77848471a2f1d9ab6df2cbb2c916d6' into froyo-plus-aosp

* commit 'a2a568e58d77848471a2f1d9ab6df2cbb2c916d6':
  Fix error code when media is filled up.
2010-04-22 15:54:37 -07:00
Suchi Amalapurapu
5014549476 Merge "Fix error code when media is filled up." into froyo 2010-04-22 15:52:25 -07:00
Leon Scroggins
99ce9748e6 am 39837c5a: am 986a0380: am 69ec5c22: Remove the WebTextView if it is drawing when it shouldn\'t. 2010-04-22 14:36:10 -07:00
Leon Scroggins
32aa719772 am 986a0380: am 69ec5c22: Remove the WebTextView if it is drawing when it shouldn\'t.
Merge commit '986a038030ab57bd36a6eb630da1773b33dfb30b' into kraken

* commit '986a038030ab57bd36a6eb630da1773b33dfb30b':
  Remove the WebTextView if it is drawing when it shouldn't.
2010-04-22 14:31:49 -07:00
Leon Scroggins
49f4cbd5da am 69ec5c22: Remove the WebTextView if it is drawing when it shouldn\'t.
Merge commit '69ec5c22d09690d33f0b87a386de13cc61eb9b42' into froyo-plus-aosp

* commit '69ec5c22d09690d33f0b87a386de13cc61eb9b42':
  Remove the WebTextView if it is drawing when it shouldn't.
2010-04-22 14:26:38 -07:00
Grace Kloba
9a54bb9161 am dbfd5e25: am 627728d2: am a6ece18d: Merge "Added the subset of partial content support so that we can continue the interrupted request to support streaming the content even with a brief disconnection." into froyo 2010-04-22 13:36:56 -07:00
Christopher Tate
d5a931b338 am 3e3ba9d5: am 88bfceae: am 75a53705: Merge "SDK: new \'bmgr\' docs in the Dev Guide" into froyo 2010-04-22 13:36:52 -07:00
The Android Open Source Project
c642e02f6b am 2b32afd0: am 5ebaf106: merge from open-source master 2010-04-22 13:36:46 -07:00
Robert Greenwalt
299d061c82 am 077952f7: am d9b802bd: am 05fa2144: Merge "Trim throttle logs." into froyo 2010-04-22 13:36:41 -07:00
Grace Kloba
0d004b4d6e am 204eca64: am b42b5a6e: am 2fba6d1c: Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo 2010-04-22 13:36:34 -07:00
Grace Kloba
bf7af40c50 am 627728d2: am a6ece18d: Merge "Added the subset of partial content support so that we can continue the interrupted request to support streaming the content even with a brief disconnection." into froyo
Merge commit '627728d26c81ce7a3ee2f784036cfe0c4e5ef899' into kraken

* commit '627728d26c81ce7a3ee2f784036cfe0c4e5ef899':
  Added the subset of partial content support so that
2010-04-22 13:25:55 -07:00
Christopher Tate
40224fb826 am 88bfceae: am 75a53705: Merge "SDK: new \'bmgr\' docs in the Dev Guide" into froyo
Merge commit '88bfceae1ab6de010b49e8c497ed2a363d6fa79a' into kraken

* commit '88bfceae1ab6de010b49e8c497ed2a363d6fa79a':
  SDK: new 'bmgr' docs in the Dev Guide
2010-04-22 13:25:49 -07:00
The Android Open Source Project
a5786f8023 am 5ebaf106: merge from open-source master
Merge commit '5ebaf10693725c9dc48219c3c65945b84d74692f' into kraken

* commit '5ebaf10693725c9dc48219c3c65945b84d74692f':
  Fix broken logic in SettingsProvider.parseProviderList.
2010-04-22 13:25:14 -07:00
Robert Greenwalt
85b87cf5a1 am d9b802bd: am 05fa2144: Merge "Trim throttle logs." into froyo
Merge commit 'd9b802bd03d0ef4792bc99289f16f6a05bd1ee95' into kraken

* commit 'd9b802bd03d0ef4792bc99289f16f6a05bd1ee95':
  Trim throttle logs.
2010-04-22 13:24:37 -07:00
Grace Kloba
b97ffc0873 am b42b5a6e: am 2fba6d1c: Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo
Merge commit 'b42b5a6edb08d198caf567acfc0a318547d8be73' into kraken

* commit 'b42b5a6edb08d198caf567acfc0a318547d8be73':
  Post a message to set SurfaceView to be visible when
2010-04-22 13:24:28 -07:00