21307 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Christopher Tate
36fa47139d Merge "Fix security hole in Google backup transport registration" into froyo 2010-04-21 18:10:20 -07:00
Christopher Tate
a32504fce8 Fix security hole in Google backup transport registration
Previously, it was conceivable that a 3rd party application on a non-GED
device could publish a service that supported the (hidden) IBackupTransport
interface and spoofed the Google backup transport's package and component
name.  This could allow it to secretly intercept all data moved through the
backup mechanism.

Fix by ensuring that the package in question exists and is part of the
OS itself (FLAG_SYSTEM in its ApplicationInfo description) before binding
to it.

Fixes bug #2457063

Change-Id: I3487572be45c2014fa209beacfe3ac6f8270f872
2010-04-21 18:02:56 -07:00
Christopher Tate
f781e86efe SDK: new 'bmgr' docs in the Dev Guide
Bug #2611397

Change-Id: If806e05bbaa55adb2b8483de08fb1af57bc69c35
2010-04-21 17:00:53 -07:00
Mike Lockwood
bdc7f891cf Fix broken logic in SettingsProvider.parseProviderList.
We were accidentally stripping both leading and trailing commas
when removing a provider from the enabled provider list.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-21 18:31:56 -04:00
John Wang
f77fff4b4e am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Merge commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb' into froyo-plus-aosp

* commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb':
  Add ILLEGAL_SIM_OR_ME error code.
2010-04-21 14:46:06 -07:00
John Wang
23c0b2eb5a Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo 2010-04-21 14:43:12 -07:00
John Wang
7fb4b8455c Add ILLEGAL_SIM_OR_ME error code.
It is for bug 2571583 to provide better failure information of network operator selection.

Network selection returns ILLEGAL_SIM_OR_ME when the failure is
permanent and no retries needed, such as illegal SIM, ME, HRL config, etc.

Change-Id: Iaf70bef64d3cbf35e4d9915418cbb5b78607f73e
2010-04-21 11:34:15 -07:00
Joe Onorato
46fba3b9e1 am 52e70b25: Add title to recent apps dialog.
Merge commit '52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a' into froyo-plus-aosp

* commit '52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a':
  Add title to recent apps dialog.
2010-04-21 11:07:43 -07:00
Joe Onorato
52e70b25f8 Add title to recent apps dialog.
Bug: 2614279

Change-Id: I45ebcd2e45140901df246db10f756c07864cccb4
2010-04-21 14:00:44 -04:00
The Android Open Source Project
f021d12f6f merge from open-source master
Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
2010-04-21 09:10:43 -07:00
Mathias Agopian
172673cd5b am 83512d4d: DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn\'t work with height <= 16
Merge commit '83512d4dfc06137bc2d9db0cb62644c54f41a771' into froyo-plus-aosp

* commit '83512d4dfc06137bc2d9db0cb62644c54f41a771':
  DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
2010-04-20 22:26:45 -07:00
Mathias Agopian
83512d4dfc DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
don't use glDrawTexi() anymore

Change-Id: If71334de39114b0edce7771366f8d8dc26f6911e
2010-04-20 21:55:40 -07:00
Jeff Brown
ccc96754c5 am 22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
Merge commit '22caecda8a24c971972d78a112279c48f242d529' into froyo-plus-aosp

* commit '22caecda8a24c971972d78a112279c48f242d529':
  Fix PM crash due to bad array bookkeeping logic.
2010-04-20 17:54:59 -07:00