Dianne Hackborn
351ddeb2da
am 5db9ff97: Update final 13 API def.
...
* commit '5db9ff97aa8f36f330f41f5ae42467795ef075b8':
Update final 13 API def.
2011-06-27 17:07:29 -07:00
Kazuhiro Ondo
1e5c72c704
Data connection retry pattern could be broken by PDP sharing
...
If a DataConnection is pending re-connect alarm, the new request
from another ApnContext sharing the same DC could disrupt
the re-connection pattern currently engaged.
This patch is to ensure the new request for PDP sharing
scenario will not trigger another SETUP_DATA request if
reconnection alarm is set in AlarmManager.
Bug: 4901019
Change-Id: I98b0d9af8b58fb880efdbc0246009de5cb116a54
2011-06-27 15:12:21 -07:00
Dianne Hackborn
5db9ff97aa
Update final 13 API def.
...
Change-Id: I90cb38f575dd1b92a3694bb5cd091f5d595cee11
2011-06-27 15:09:40 -07:00
Robert Ly
0711c86c38
am 81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2
...
* commit '81cbc294ddb08c2bc08be9b2abbbcc7c19ec88d9':
docs: fixing new superscript for rs
2011-06-27 11:49:30 -07:00
Robert Ly
81cbc294dd
Merge "docs: fixing new superscript for rs" into honeycomb-mr2
2011-06-27 11:45:41 -07:00
Robert Ly
491a6de28d
docs: fixing new superscript for rs
...
Change-Id: I0563842a3a43972b131a2ec30ed8357b8136fc6d
2011-06-27 10:33:01 -07:00
Anirudh Dewani
3ba39ef20f
am 1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2
...
* commit '1f82dc08f1616a83d8d1c43fa9ac16d0d60dd537':
Typo in spinner tutorial.
2011-06-26 23:06:04 -07:00
Anirudh Dewani
1f82dc08f1
Merge "Typo in spinner tutorial." into honeycomb-mr2
2011-06-26 23:02:56 -07:00
Dianne Hackborn
fa5e3b658f
am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
...
* commit '2dafe771bb7ad4b15db6b740fd3ccb8f0fae836d':
DO NOT MERGE. Fix density compat mode.
2011-06-24 12:26:17 -07:00
Dianne Hackborn
2dafe771bb
Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
2011-06-24 12:13:16 -07:00
Anirudh Dewani
9b375068ac
Typo in spinner tutorial.
...
Change-Id: I2bacd7b417c21944703738cd410dc1ec67c1b554
2011-06-24 16:30:20 +05:30
Wink Saville
f49e4d3f18
Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE
2011-06-23 18:21:36 -07:00
Kazuhiro Ondo
1ccb10e25d
Temporary re-enabling iface name change handling on HO
...
Temporary accept interface name change in ConnectivityService.
See bug/4455071.
Bug: 4903011
Change-Id: I7f06c2ca83535b981f047cb671e08550aed7df1a
2011-06-23 14:58:50 -07:00
Scott Main
f169bae87d
am f8d37ab6: Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2
...
* commit 'f8d37ab6b35c6cdd44e833ae4bd65301f2d3543a':
docs: add emphasis to adding a search button in activity UI
2011-06-23 13:12:30 -07:00
Scott Main
f8d37ab6b3
Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2
2011-06-23 13:08:27 -07:00
Scott Main
72e0df6573
docs: add emphasis to adding a search button in activity UI
...
Change-Id: I13c4673cdb8caab65dd8d57046f54b0ae3bf48e2
2011-06-23 13:07:26 -07:00
Dianne Hackborn
83e0bc18e0
DO NOT MERGE. Fix density compat mode.
...
Fix issue #4770360 : older app compatibility mode is really tiny on ICS phones
We were applying the density compat mode scaling multiple times to
display metrics, causing bad values.
Change-Id: Iafafd9a5e94b9d774cd2715bf968e91602a1bd82
2011-06-23 12:29:03 -07:00
Scott Main
db76388e9a
am 9a05cfe5: docs: update docs for new screen support attributes and qualifiers
...
* commit '9a05cfe5427a6cee988333e0d65f17b9854554a3':
docs: update docs for new screen support attributes and qualifiers
2011-06-23 12:26:33 -07:00
Scott Main
9a05cfe542
docs: update docs for new screen support attributes and qualifiers
...
Change-Id: I8fdfd90e5d7970bdbb72e0b3271f047f5ed300ee
2011-06-23 11:35:07 -07:00
Scott Main
a602972c3f
am 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2
...
* commit '1acd2a7f2b263e9d8de23a0d5630d77efe370c80':
docs: add Lenevo driver info
2011-06-23 09:28:34 -07:00
Scott Main
1acd2a7f2b
Merge "docs: add Lenevo driver info" into honeycomb-mr2
2011-06-23 09:18:22 -07:00
Robert Greenwalt
1d6ffd7339
Merge "Restrict access to protected networks." into honeycomb-LTE
2011-06-23 08:04:48 -07:00
Scott Main
dc0ae0cb97
am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
...
* commit '138836adc7e28e66984fdc20d22688d4da561c15':
docs: add info about manifest attributes that should not change
2011-06-22 17:53:12 -07:00
Scott Main
138836adc7
Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
2011-06-22 17:45:13 -07:00
Robert Greenwalt
50393202f3
Restrict access to protected networks.
...
Some networks should only be brought up and controlled by system apps.
bug: 4585677
Change-Id: I61b1ee3dcfca0ee54387cecffe5198a0b010d98b
2011-06-22 16:35:12 -07:00
Scott Main
9fc3579cab
docs: add info about manifest attributes that should not change
...
Change-Id: Ia58d855ccaa3348bc0a2f7a4b7847ec115c442e8
2011-06-22 15:57:37 -07:00
Jerry J. Wang
a5342f1a63
am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2
...
* commit '850aaaeff6df3c1c6e9cec5ae67225bb57728e0e':
Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
2011-06-22 15:11:04 -07:00
Jerry J. Wang
850aaaeff6
Merge "Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2
2011-06-22 15:08:25 -07:00
Scott Main
e2f74aeca9
am 929cba13: docs: remove exclamation from media title
...
* commit '929cba1391432eb66329781c866c92a07d3f45ae':
docs: remove exclamation from media title
2011-06-22 14:46:43 -07:00
Katie McCormick
a108223fb6
am d4fac2c0: Doc change: updated TOC for Bluetooth CL.
...
* commit 'd4fac2c0263fda4b20f253edd594cf909e61eb4e':
Doc change: updated TOC for Bluetooth CL.
2011-06-22 14:43:36 -07:00
Scott Main
929cba1391
docs: remove exclamation from media title
...
Change-Id: If89584a6b52c6a0e70e6636e1da260b47c0ca072
2011-06-22 14:43:14 -07:00
Katie McCormick
d4fac2c026
Doc change: updated TOC for Bluetooth CL.
...
Change-Id: Ifd60e332d3088402e939fc851374800f526f8cdf
2011-06-22 14:28:29 -07:00
Scott Main
6f2bcc4db1
am 24ef1aa6: Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2
...
* commit '24ef1aa672cc15984df7cccc5115fdda3ac85f58':
docs: use new CSE to show results for all sites
2011-06-22 14:26:10 -07:00
Scott Main
24ef1aa672
Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2
2011-06-22 14:23:22 -07:00
Scott Main
702a6caa20
docs: use new CSE to show results for all sites
...
Change-Id: Idd85d78fcdd90381b6f03406a76b13e02d540e37
2011-06-22 13:58:32 -07:00
Robert Ly
60506b4f68
am d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
...
* commit 'd60e1b5b9132c6dba912fd5b4f5d7e12fd816244':
cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
2011-06-22 12:52:25 -07:00
Robert Ly
d60e1b5b91
cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
...
Change-Id: Ib47cf367f5c9ca66da2921fa86078693198a7968
2011-06-22 12:44:02 -07:00
Dave Burke
0b62c2a6e0
Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
...
Change-Id: If63fdda72a4399e264eed85e2e190c00f383a52d
2011-06-22 20:18:18 +01:00
Irfan Sheriff
db45e0bdd0
am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2
...
* commit 'ecce539f3d739fbf4b395639a485fddf51f688d6':
Release wakelock after use
2011-06-22 11:10:26 -07:00
Bruno Oliveira
0310f4dad3
am f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
...
* commit 'f5c6236289e9f8a7df6af0bea78887ba2cbf406e':
Rewriting "Audio and Video" section of Dev Guide.
2011-06-22 11:10:24 -07:00
Irfan Sheriff
38053dad9f
am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""
...
* commit '41b35884ff68a62f5fc8f65dcc26342d0889113d':
Revert "DO NOT MERGE Revert "Fix lease duration handling""
2011-06-22 11:10:16 -07:00
Irfan Sheriff
cf99765b62
resolved conflicts for merge of 914ed90f to honeycomb-LTE
...
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
2011-06-22 11:01:16 -07:00
Irfan Sheriff
5d5b73be51
Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE
2011-06-22 07:27:39 -07:00
Irfan Sheriff
c74eacde30
resolved conflicts for merge of 267a6181 to honeycomb-LTE
...
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
2011-06-22 07:11:42 -07:00
Wink Saville
4d9261fad3
Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE
2011-06-21 19:32:36 -07:00
Wink Saville
64a09341d8
Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE
2011-06-21 19:32:25 -07:00
Wink Saville
aef70d3f73
Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE
2011-06-21 19:32:16 -07:00
Wink Saville
ac4ff8958e
Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE
2011-06-21 19:32:05 -07:00
Irfan Sheriff
ecce539f3d
Merge "Release wakelock after use" into honeycomb-mr2
2011-06-21 19:17:27 -07:00
Kazuhiro Ondo
7c2d6fd60d
Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
...
Bug: 4764057
Change-Id: I0c7d6e2af6a597d70d2024205d358e8b9c56b57b
2011-06-21 18:02:51 -07:00