22333 Commits

Author SHA1 Message Date
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
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
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
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
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
Suchi Amalapurapu
db2e6159dd 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
a298d6fd2a 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
a2a568e58d Merge "Fix error code when media is filled up." into froyo 2010-04-22 15:52:25 -07:00
Robert Greenwalt
fb9896b5cd Add a Throttle check shortly after boot.
Throttle is useless when ntp and imsi are not yet ready.  In the real world
the second check won't happen for 10 minutes letting people do what they want
for 10 minutes each boot.  Trim this down with a quicker first check.

bug:2614247
Change-Id: I84ec33f31e8fed37b3933482fbc187b8e9e94e79
2010-04-22 15:39:38 -07:00
Wei Huang
fdf3b26ba7 bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.
Change-Id: Ica1df6582533edf8d9a5825dbe510eeab4828309
2010-04-22 15:13:48 -07:00
Leon Scroggins
39837c5a5e 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
986a038030 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
Leon Scroggins
69ec5c22d0 Remove the WebTextView if it is drawing when it shouldn't.
Bug 2614064

Change-Id: Id5d0a27e862bb783299f6fa4863221a27318f52c
2010-04-22 17:09:24 -04:00
Suchi Amalapurapu
d345bb6e5b Fix error code when media is filled up.
Change-Id: Id8dae2e7c967e3f103aecd2f31abb7e292af8f1d
2010-04-22 13:43:20 -07:00
Grace Kloba
dbfd5e2567 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
3e3ba9d51d 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
2b32afd07d 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
077952f73e 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
204eca6439 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
Grace Kloba
627728d26c 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 'a6ece18d95a35acc4fb3f9648403ce42d0d6b2d7' into froyo-plus-aosp

* commit 'a6ece18d95a35acc4fb3f9648403ce42d0d6b2d7':
  Added the subset of partial content support so that
2010-04-22 13:05:15 -07:00
Grace Kloba
a6ece18d95 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:01:55 -07:00
Christopher Tate
88bfceae1a am 75a53705: Merge "SDK: new \'bmgr\' docs in the Dev Guide" into froyo
Merge commit '75a537051de4220d32e8aa72348909757fa11e5d' into froyo-plus-aosp

* commit '75a537051de4220d32e8aa72348909757fa11e5d':
  SDK: new 'bmgr' docs in the Dev Guide
2010-04-22 12:54:36 -07:00
Christopher Tate
75a537051d Merge "SDK: new 'bmgr' docs in the Dev Guide" into froyo 2010-04-22 12:51:22 -07:00
The Android Open Source Project
5ebaf10693 merge from open-source master
Change-Id: I2a3a06f0bd3530f9c0d3cb64ca6a87913649d64b
2010-04-22 11:43:17 -07:00
Grace Kloba
52e41583f5 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.

Note: we don't update the headers for partial content
as the headers we care should not be updated. See
a list in chromium/net/http/http_response_headers.cc.

We currently also don't support cache for partial content.

Fix http://b/issue?id=2616477
2010-04-22 09:51:18 -07:00
Robert Greenwalt
d9b802bd03 am 05fa2144: Merge "Trim throttle logs." into froyo
Merge commit '05fa2144e458dc8f024235ea01b8682055d828bf' into froyo-plus-aosp

* commit '05fa2144e458dc8f024235ea01b8682055d828bf':
  Trim throttle logs.
2010-04-22 09:11:35 -07:00
Robert Greenwalt
05fa2144e4 Merge "Trim throttle logs." into froyo 2010-04-22 09:08:25 -07:00
Robert Greenwalt
bf7de39727 Trim throttle logs.
Removing unwanted sntp logging and throttle logging.

bug:2614927
Change-Id: Ic0b1c3502ebbc1f04130d09d715591af6513f439
2010-04-22 09:04:27 -07:00
Grace Kloba
b42b5a6edb 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 '2fba6d1c1b445b2d26ccd32eb4084e759f513c5d' into froyo-plus-aosp

* commit '2fba6d1c1b445b2d26ccd32eb4084e759f513c5d':
  Post a message to set SurfaceView to be visible when
2010-04-22 08:23:35 -07:00
Grace Kloba
2fba6d1c1b 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 08:20:23 -07:00
Mathias Agopian
9bce8737f2 more surfaceflinger cleanups
get rid of the "fake rtti" code, and use polymorphism instead.
also simplify how we log SF's state (using polymorphism)

Change-Id: I2bae7c98de4dd207a3e2b00083fa3fde7c467922
2010-04-21 22:28:20 -07:00
Mathias Agopian
33c8e2b8e0 Merge "better fix for [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken 2010-04-21 22:27:22 -07:00
Mathias Agopian
a8a0aa8b92 better fix for [2420565] Surface.lockCanvas() updates the dirty region too often
Change-Id: I83438b40effd21538f1c74396dc665254b9d5ab6
2010-04-21 22:25:35 -07:00
Grace Kloba
8aedd10aca 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.

Fix http://b/issue?id=2616263
2010-04-21 21:23:30 -07:00
Kenny Root
392fc35735 Merge "Fix broken logic in SettingsProvider.parseProviderList." 2010-04-21 20:06:51 -07:00
Christopher Tate
1d6ff5a1f7 am 7e93aad4: am 36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo
Merge commit '7e93aad42d5f96e4e3a471e49384e1ce794c9411' into kraken

* commit '7e93aad42d5f96e4e3a471e49384e1ce794c9411':
  Fix security hole in Google backup transport registration
2010-04-21 18:19:38 -07:00
Christopher Tate
7e93aad42d am 36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo
Merge commit '36fa47139d4621dc4bf8d89caa8650495d901b00' into froyo-plus-aosp

* commit '36fa47139d4621dc4bf8d89caa8650495d901b00':
  Fix security hole in Google backup transport registration
2010-04-21 18:15:44 -07:00