22911 Commits

Author SHA1 Message Date
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
701897451b am 81b7ea00: am f77fff4b: am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo 2010-04-21 15:00:21 -07:00
John Wang
81b7ea0028 am f77fff4b: am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Merge commit 'f77fff4b4e904486bf25affde713294d40764e15' into kraken

* commit 'f77fff4b4e904486bf25affde713294d40764e15':
  Add ILLEGAL_SIM_OR_ME error code.
2010-04-21 14:51:43 -07: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
Steve Block
cef45f3368 Removes XPath layout tests from the Dump Render Tree ignore results list
XPath was enabled in https://android-git.corp.google.com/g/49109

Change-Id: I4704e63965a0bc8ac53b8cbc939242b79d71dc78
2010-04-21 21:55:51 +01: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
d07d6c6ea7 am a8624186: am 46fba3b9: am 52e70b25: Add title to recent apps dialog. 2010-04-21 11:20:59 -07:00
Joe Onorato
a8624186a6 am 46fba3b9: am 52e70b25: Add title to recent apps dialog.
Merge commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873' into kraken

* commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873':
  Add title to recent apps dialog.
2010-04-21 11:12:29 -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
Leon Scroggins III
901a7c230c Remove call to rebuildWebTextView from handling selection change.
The call was originally added to fix bug 2431351, where touching
a <textarea> sent a message with the new selection, but the UI
thread had not yet updated the WebTextView, so the new selection
was ignored.  However, since then,
https://android-git.corp.google.com/g/#change,45476 was submitted
to pass the selection and open the keyboard at the same time. So
when UPDATE_TEXT_SELECTION_MSG_ID is received, we no longer need
to worry about the case where the WebTextView is not set up yet.

Bug 2600847

Change-Id: I19eb102a7188e6edafaa5ac17b19ebd4ab5764f0
2010-04-21 12:37:39 -04:00
The Android Open Source Project
3c0f1aed7c am d29eafdb: am f021d12f: merge from open-source master 2010-04-21 09:24:17 -07:00
The Android Open Source Project
d29eafdba5 am f021d12f: merge from open-source master
Merge commit 'f021d12f6f7116e9275cd3553a349ce5cb8aab14' into kraken

* commit 'f021d12f6f7116e9275cd3553a349ce5cb8aab14':
  Allow META* macros outside of the framework
  Fix printing order of phone objects creation
2010-04-21 09:15:15 -07:00
Leon Scroggins III
b24e18b1c0 Update mTextGeneration when setting the selection to the default.
Bug 2610682

Change-Id: Ib3b95cd9443ef31a6c736cdac076260b4f3bbe71
2010-04-21 12:13:49 -04:00
The Android Open Source Project
f021d12f6f merge from open-source master
Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
2010-04-21 09:10:43 -07:00
Daisuke Miyakawa
6994f31189 Merge "vCard refactoring." 2010-04-21 00:10:59 -07:00
Daisuke Miyakawa
56374c43f7 vCard refactoring.
Change-Id: Ie6c5e0edae4a13279d5118f0380d863e4ff05727
2010-04-21 16:06:09 +09:00
Mathias Agopian
ef08207bd2 am e1d851d3: (-s ours) am 172673cd: (-s ours) am 83512d4d: DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn\'t work with height <= 16 2010-04-20 22:35:24 -07:00
Mathias Agopian
e1d851d36d am 172673cd: (-s ours) am 83512d4d: DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn\'t work with height <= 16
Merge commit '172673cd5b21dee6e175ab67235aa19bc2689868' into kraken

* commit '172673cd5b21dee6e175ab67235aa19bc2689868':
  DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
2010-04-20 22:29:05 -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
b633123f9b am bba573c2: am ccc96754: am 22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo 2010-04-20 18:05:50 -07:00
Jeff Brown
bba573c211 am ccc96754: am 22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
Merge commit 'ccc96754c5c6e31d6f782c3adeb06ad1694221d8' into kraken

* commit 'ccc96754c5c6e31d6f782c3adeb06ad1694221d8':
  Fix PM crash due to bad array bookkeeping logic.
2010-04-20 17:57:29 -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
76944798f5 am 54f5ecc6: am 9127d9a5: am be348964: Merge "Move Tethering off the ServerThread." into froyo 2010-04-20 17:48:54 -07:00
Robert Greenwalt
54f5ecc6d1 am 9127d9a5: am be348964: Merge "Move Tethering off the ServerThread." into froyo
Merge commit '9127d9a5fd95d7454a10d44acb79079720f6bb91' into kraken

* commit '9127d9a5fd95d7454a10d44acb79079720f6bb91':
  Move Tethering off the ServerThread.
2010-04-20 17:42:08 -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
0408f3d4d0 am f5e20801: am 89e28cbe: 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 2010-04-20 16:43:26 -07:00
Andreas Huber
f5e208018b am 89e28cbe: 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 '89e28cbefaff6ae9499032bb446ae7e72e019466' into kraken

* commit '89e28cbefaff6ae9499032bb446ae7e72e019466':
  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:37:35 -07:00
Mathias Agopian
345dd8ef83 am b834b38a: Merge "added setCrop() to android_native_window_t" into kraken 2010-04-20 16:37:29 -07:00
Mathias Agopian
2ff1ef2c8e am 827cda45: Merge "add support for up to 16 buffers per surface" into kraken 2010-04-20 16:37:25 -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
Mathias Agopian
b834b38a28 Merge "added setCrop() to android_native_window_t" into kraken 2010-04-20 16:28:24 -07:00
Mathias Agopian
827cda456a Merge "add support for up to 16 buffers per surface" into kraken 2010-04-20 16:28:14 -07:00
Jean-Michel Trivi
399eb1f00e am 219dbb67: am 8dc4c790: 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 2010-04-20 16:15:33 -07:00
Mathias Agopian
62788470df am 360865e2: Merge "clean-up surfaceflinger a bit" into kraken 2010-04-20 16:08:06 -07:00
Jean-Michel Trivi
219dbb67a6 am 8dc4c790: 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 clie
Merge commit '8dc4c790e2c278f8f671c728401ee9458d2d74ab' into kraken

* commit '8dc4c790e2c278f8f671c728401ee9458d2d74ab':
  Update AudioService to reflect phone state changes with AudioFocus.
2010-04-20 16:04:08 -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
Mathias Agopian
360865e26c Merge "clean-up surfaceflinger a bit" into kraken 2010-04-20 15:59:57 -07:00
Mathias Agopian
e5c0a7b781 clean-up surfaceflinger a bit
get rid of the glDrawTexi path and use floating points instead of fixed point maths

Change-Id: I3aa9ce2dc082f702160e605a16ba5fe987cdf087
2010-04-20 15:58:36 -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