21281 Commits

Author SHA1 Message Date
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
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
Jeff Brown
22caecda8a Merge "Fix PM crash due to bad array bookkeeping logic." into froyo 2010-04-20 17:53:00 -07:00
Robert Greenwalt
9127d9a5fd am be348964: Merge "Move Tethering off the ServerThread." into froyo
Merge commit 'be34896457bb37b4e263efa87316d2e2420adab3' into froyo-plus-aosp

* commit 'be34896457bb37b4e263efa87316d2e2420adab3':
  Move Tethering off the ServerThread.
2010-04-20 17:39:38 -07:00
Robert Greenwalt
be34896457 Merge "Move Tethering off the ServerThread." into froyo 2010-04-20 17:37:22 -07:00
Jeff Brown
8c8bb8b3c4 Fix PM crash due to bad array bookkeeping logic.
Bug: 2586093
Change-Id: I320deeef65a434060e608015dc2dd97b8200e025
2010-04-20 17:21:47 -07:00
Andreas Huber
89e28cbefa am 9e609b0d: Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo
Merge commit '9e609b0dfa155fbe8ba3b5abd4faa188e2270dde' into froyo-plus-aosp

* commit '9e609b0dfa155fbe8ba3b5abd4faa188e2270dde':
  Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.
2010-04-20 16:32:30 -07:00
Andreas Huber
9e609b0dfa Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo 2010-04-20 16:29:23 -07:00
Jean-Michel Trivi
8dc4c790e2 am fe8620ac: Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clients cannot re
Merge commit 'fe8620ac42c9b61ab47fab83caa34816e6404ee5' into froyo-plus-aosp

* commit 'fe8620ac42c9b61ab47fab83caa34816e6404ee5':
  Update AudioService to reflect phone state changes with AudioFocus.
2010-04-20 16:00:58 -07:00
Jean-Michel Trivi
fe8620ac42 Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clients cannot request audio focus (request is denied). Because the phone state is now mostly handled like a new client, there is no need monitor mode changes and to keep track of undispatched focus changes, as those will delayed focus gains will now automatically happen at the end of the call when the phone client is removed from the focus stack." into froyo 2010-04-20 15:57:30 -07:00
Andreas Huber
63fbd5ab8f Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.
Change-Id: Ic2d4a8f5b6bbf16772fba39377809ec68d249c1f
related-to-bug: 2611257
2010-04-20 15:56:36 -07:00
Robert Greenwalt
7eae25021d Move Tethering off the ServerThread.
An ANR has been reported because somebody else was hogging the Netd
link.  We can't pause the server thread for that, so make a new thread.

bug:2609904
Change-Id: I0430a08621da1cda0a0010ce15826cceee59a529
2010-04-20 15:51:20 -07:00
Jean-Michel Trivi
b4bccb6d8d Update AudioService to reflect phone state changes with AudioFocus.
Phone calls and rings are treated as a new client, with a dedicated
client ID that identifies it in the audio focus stack. When it is
present in the stack, others clients cannot request audio focus
(request is denied).
Because the phone state is now mostly handled like a new client,
there is no need monitor mode changes and to keep track of
undispatched focus changes, as those will delayed focus gains
will now automatically happen at the end of the call when the
phone client is removed from the focus stack.

Change-Id: I11ff73b015ab93f07040755fd8ee75c8d675e025
2010-04-20 15:23:39 -07:00
Suchi Amalapurapu
d32f942280 am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
Merge commit '0dde41fbe0e36bfe059399c839604267ad0318c1' into froyo-plus-aosp

* commit '0dde41fbe0e36bfe059399c839604267ad0318c1':
  Fix 2610961
2010-04-20 15:08:50 -07:00
Suchi Amalapurapu
0dde41fbe0 Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo 2010-04-20 15:04:41 -07:00
Andreas Huber
1e1edb2c73 am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo
Merge commit '25dc5f30b2a8276c5790c7152a801fcd905c7281' into froyo-plus-aosp

* commit '25dc5f30b2a8276c5790c7152a801fcd905c7281':
  Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
2010-04-20 14:52:57 -07:00
Andreas Huber
25dc5f30b2 Merge "Don't coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo 2010-04-20 14:48:45 -07:00
Jean-Michel Trivi
0fabf2e815 am 8ccbd4ba: Merge "Fix bug 2604132 40s skip after undocking In case of A2DP write errors, there is an overflow in the calculation of the sleep duration to simulate the timing of a successful write." into froyo
Merge commit '8ccbd4ba6d7f1180284df7aa5735dba48b10d8ee' into froyo-plus-aosp

* commit '8ccbd4ba6d7f1180284df7aa5735dba48b10d8ee':
  Fix bug 2604132 40s skip after undocking
2010-04-20 14:45:06 -07:00
Jean-Michel Trivi
8ccbd4ba6d Merge "Fix bug 2604132 40s skip after undocking In case of A2DP write errors, there is an overflow in the calculation of the sleep duration to simulate the timing of a successful write." into froyo 2010-04-20 14:41:11 -07:00
Andreas Huber
2dd8ff8c4f Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place.

In certain edge cases (encoded audio track contains silence), each buffer would turn out to be an amazing 6(!!!) bytes, we'd spend lots and lots of time streaming network data to fill the codec's buffers of size 6144 bytes with .. silence.

Change-Id: I9f449f310fc64ca384bd02e4a783e33cf5b46fcc
related-to-bug: 2609049
QA-Impact: streamed (http) playback of aac audio content on Droid.
2010-04-20 14:26:00 -07:00
Michael Richardson
5a870fee53 Allow META* macros outside of the framework
The META* macros are useful outside of the framework
for other systems implementing Binder interfaces, but
they depend upon the android namespace. This includes
the appropriate namespace operations, which should be
sane even in that android namespace.

Change-Id: If600156c65191f51f487d0ee301d9f9f532b263d
2010-04-20 14:14:30 -07:00
Suchi Amalapurapu
89e0c1a9f5 Fix 2610961
Unhide broadcast intents that are sent when sdcard gets mounted/unmounted.

Change-Id: Ibb5700178e98f657f1c2b6a2f83e722151c4a44f
2010-04-20 14:08:08 -07:00
Nicolas Roard
3f5d7b83ee am b876bdb5: Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo
Merge commit 'b876bdb52e7c72ced8e7764946e5beb914f17036' into froyo-plus-aosp

* commit 'b876bdb52e7c72ced8e7764946e5beb914f17036':
  Speed up layers rendering when using animations
2010-04-20 13:26:36 -07:00
Nicolas Roard
b876bdb52e Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo 2010-04-20 13:22:44 -07:00
Daniel Sandler
29019cb977 am c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
Merge commit 'c96307efd2829cdd0fa7c835484f2f89edf7d883' into froyo-plus-aosp

* commit 'c96307efd2829cdd0fa7c835484f2f89edf7d883':
  Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)
2010-04-20 13:01:58 -07:00
Daniel Sandler
c96307efd2 Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo 2010-04-20 12:57:54 -07:00
Jean-Michel Trivi
2f22d35936 Fix bug 2604132 40s skip after undocking
In case of A2DP write errors, there is an overflow in the calculation
of the sleep duration to simulate the timing of a successful write.

Change-Id: Ic4e570aebf07fac69735aab1bbc2fc73512ee795
2010-04-20 12:12:13 -07:00
Nicolas Roard
f343a043ef Speed up layers rendering when using animations
Cherry-pick from master

Bug:2522049
Change-Id: I441f00b6e7551930c4f76983681f4cd0c57ce017
2010-04-20 12:05:39 -07:00