23062 Commits

Author SHA1 Message Date
Jean-Michel Trivi
460587e9e6 am f6adae78: am 47dad8fa: Merge "Fix bug 2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo
Merge commit 'f6adae7866e893afa05b5838bdd244648a66ac3f' into kraken

* commit 'f6adae7866e893afa05b5838bdd244648a66ac3f':
  Fix bug 2619062 Music is routed to Phone speaker, though it is
2010-04-23 14:53:09 -07:00
Jean-Michel Trivi
f6adae7866 am 47dad8fa: Merge "Fix bug 2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo
Merge commit '47dad8fa8d1eddf31dd0665a6d341e2f4f593d08' into froyo-plus-aosp

* commit '47dad8fa8d1eddf31dd0665a6d341e2f4f593d08':
  Fix bug 2619062 Music is routed to Phone speaker, though it is
2010-04-23 14:50:55 -07:00
Jean-Michel Trivi
47dad8fa8d Merge "Fix bug 2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo 2010-04-23 14:48:10 -07:00
Bryan Mawhinney
2131a3caa8 Fix typo when parsing external platform version from Settings.
May fix http://b/2569139

Change-Id: I437f614fd25512bd461812feddb091edcd12ccb7
2010-04-23 22:42:17 +01:00
Dianne Hackborn
a2c980d30f am 8aed789f: am 994e3990: am 2adec762: Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo 2010-04-23 14:36:21 -07:00
Neal Nguyen
22b0d17320 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
8aed789f83 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
0c817ba34a 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
994e39908b 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
27e5a95afc 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
2adec762fb Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo 2010-04-23 14:23:39 -07:00
Neal Nguyen
5fa65082f1 Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo 2010-04-23 14:21:53 -07:00
Dianne Hackborn
149427cd90 Fix issue #2621809: Kill! Kill! Kill!
Stop! Stop! Stop!  Spamming the log.

Change-Id: I13f432b49d8c85165873566d58e2fb2714b1263e
2010-04-23 14:20:03 -07:00
Robert Greenwalt
1522cf1f49 am 9ef25759: am b6c770e4: am 0b2ebe9b: Merge "Respond to changes in throttle policy." into froyo 2010-04-23 14:02:31 -07:00
Jean-Michel Trivi
a847ba4080 Fix bug 2619062 Music is routed to Phone speaker, though it is
connected to A2DP media profile

When the phone is docked and using the dock A2DP, and the user
connects another A2DP device, make the dock unavailable immediately
before connecting the new A2DP device.

Change-Id: I82d53836fb509ee4ea7cdb68f467dfb946c634f8
2010-04-23 13:59:45 -07:00
Robert Greenwalt
9ef25759f8 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
b6c770e4e3 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
0b2ebe9b45 Merge "Respond to changes in throttle policy." into froyo 2010-04-23 13:50:03 -07:00
Steve Block
48ed0560ef 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
Steve Block
1d9b466568 Updates DumpRenderTree ignore list to reflect status of touch event tests at current WebKit revision (r54731).
Touch event tests were added to the Android tree in https://android-git.corp.google.com/g/49637

Change-Id: I6c28b137fc70a26a1db94cdb72e283629eaaa2bf
2010-04-23 13:34:00 -07:00
Jeff Hamilton
8af711d352 Attempt to fix the build.
Change-Id: I03569da7a426b17fded35a23d01586e837769836
2010-04-23 15:31:35 -05:00
Tim Park
ff276bd716 Update sym_action_call icon to match icon used elsewhere
Fix bug 2158676:  Update sym_action_call.png so that it matches phone
icon used elsewhere throughout the system.

Change-Id: I3ce9166dea6f8b626b6c68bec71f42d2797ce79f
2010-04-23 13:30:03 -07:00
Robert Greenwalt
5bf16d6e8c Respond to changes in throttle policy.
We were updating limits and such before, but we were not applying them
to the current situation if we were already throttled.  Now it can result in
us throttling or changing our throttle rate or unthrottling or even making
the ui come or go (disabling/enable throttling)

bug:2622543
bug:2619879
Change-Id: I64a62634d54f4768ab8625f8d72f9f66a239cb19
2010-04-23 13:15:44 -07:00
Dianne Hackborn
2291fe2a8c 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
0c1be50ffa 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
dc14dc6d60 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
bf73bbffc1 Merge "Some debugging help for issue #2594388" into froyo 2010-04-23 12:59:47 -07:00
Vasu Nori
2e30128535 Merge "fix a bug introduced when prepared-statement cache was made LRU-based" 2010-04-23 11:52:34 -07:00
Vasu Nori
9504c70f88 fix a bug introduced when prepared-statement cache was made LRU-based
1. when an entry is pushed out of cache, it should be released if it is not
in use by any thread. This didn't have to be done when cache was NOT LRU
because the object either got into the cache while the caller had a reference
to it or it didn't. if it didn't get into cache (because cache is full),
the caller's close() released the object. But in LRU cache, an object
could get pushed out of cache due to LRU policy and if it is NOT in use
by any thread at the time it was pushed out of cache, then it
got GC'ed - which caused warnings to be pronted in the log.
2. also delete some unused methods in SQLiteDatabase.

Change-Id: I7831952647d3a057342bcc8ac186a6a26eb58f33
2010-04-23 11:32:57 -07:00
Neal Nguyen
edb979a331 Re-enabling unit tests for PackageManager/Apps on SD.
Change-Id: I305d2e6d96418ab5b2df0ee7a31261180676204f
2010-04-23 10:59:23 -07:00
Robert Greenwalt
916db002ab 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
d066e3c266 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
1b5a9c5d2f 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
251ccef044 Merge "Add a Throttle check shortly after boot." into froyo 2010-04-23 10:17:14 -07:00
Dianne Hackborn
ba3e31d9ee Some debugging help for issue #2594388
WallpaperService doesn't always call onSurfaceDestroyed()

Just helps us see a little better what is going on.

Change-Id: Ibe8efd9e343e880ca31df446c8b36c7fa3722e87
2010-04-22 18:59:03 -07:00
Wei Huang
1b7f0d4e38 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
d54c48b29d 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
f2c0f29a65 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
c9d07b0946 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
9666bbdf1b 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
7b88af679a 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
e06c1e38e9 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
2fe441fa61 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
4bcdd6b068 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
476a57e64a 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
90c6aec10f Merge "Fix issue #2619247: Music sometimes stops playing when navigation talks" into froyo 2010-04-22 16:23:44 -07:00
Dianne Hackborn
9bc0a572d8 Merge "Fix issue #2608292: Fails to launch the video camera preview" into froyo 2010-04-22 16:20:19 -07:00
Dianne Hackborn
8633e68ebd Fix issue #2619247: Music sometimes stops playing when navigation talks
When a service transitions from foreground to background, we now push it
to the top of the LRU list.  Also fix the activity manager to take care
of killing processes if we go beyond a reasonable number of background
process to keep around.

Change-Id: Ic9f44c02af7a111ee6f1d06142386b301948bafe
2010-04-22 16:11:18 -07:00
Suchi Amalapurapu
a9250497f5 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
Dianne Hackborn
f09c1a247a Fix issue #2608292: Fails to launch the video camera preview
Need to clear the attached hidden flag on the window, even if it does
not yet have an actual surface.

Change-Id: I0a90f6b03cd8e347a3eae4d6bea3ab93f7128bf4
2010-04-22 15:59:21 -07:00