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
Wink Saville
d1ec23c206
Use dataConnectionNotInUse to decide if a DC is free.
...
Change-Id: I89cb2f46dca59d5738dd16eb657104c3158ebcd2
2011-06-21 17:58:45 -07:00
Bruno Oliveira
f5c6236289
Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
2011-06-21 16:44:56 -07:00
Kazuhiro Ondo
e0acd0842f
Special retry back-off timer in call setup failure.
...
RIL might specify a special retry back-off timer only used for
temporary in a certain error scenario. This patch will be adding
new handling of "retry" override so RIL specified retry timer
can be used instead of the pre-configured one.
Bug: 4723641
Change-Id: Ia4784f022a029c79b35c4c4c01ad7e49efd56a3c
2011-06-21 16:17:03 -07:00
Kazuhiro Ondo
e303d7b318
Fix handling of unsol_data_state_change with PDP sharing scenario
...
The original logic was to go through each ApnContext to find
changes on the DataConnection if applicable. This was causing
an issue when an DC is shared by multiple ApnContexts. Only
the first ApnContext associated with the updated DC was detecting
the link properties change.
The change in this patch is to go through the changes by DC instead
of ApnContext. And make sure the update on a DC is propagated to
all associated ApnContexts.
Bug: 4744006
Change-Id: Ie52d62d1d5671005f9e74b1ddc24822c9013e3e4
2011-06-21 16:14:03 -07:00
Bruno Oliveira
54340961bd
Rewriting "Audio and Video" section of Dev Guide.
...
Rewriting the "Audio and Video" section of the Dev Guide, renaming it
Media Framework and adding a more details about MediaPlayer,
interaction between MediaPlayer and services, Audio Focus, etc.
Staging:
http://www.corp.google.com/~btco/tmp/offline-sdk/guide/topics/media/index.html
This is a cherrypick of CL 106666 which was originally on honeycomb-mr1.
Link to old CL:
https://android-git.corp.google.com/g/#change,106666
Change-Id: I0efa4c9ed73af7f9dcb02232a6af4a7527645367
2011-06-21 18:55:46 -04:00
Irfan Sheriff
cd672ebf29
Release wakelock after use
...
DHCP renewal can finish pretty quick most times and holding
a timed wakelock wastes battery.
Hold a non-reference counted lock and release it immediate
while having the safety of a 40s release
Bug: 4575773
Change-Id: I49d2e8c27b2723690aef26417c4b9a145843a401
2011-06-21 15:42:48 -07:00
Irfan Sheriff
885c3c11cf
am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
...
* commit 'bc4ddef479011e200d0273fe73c22922a85de1fe':
DO NOT MERGE Revert "Fix lease duration handling"
2011-06-21 14:29:42 -07:00
Irfan Sheriff
41b35884ff
Revert "DO NOT MERGE Revert "Fix lease duration handling""
...
This reverts commit 7dd120058972226158176b292c00841efecc259f.
2011-06-21 14:26:59 -07:00
Irfan Sheriff
914ed90f2c
Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
...
This reverts commit 58d1bb497e0d83e28a02fbcdc1f33f29a992db7e.
2011-06-21 14:26:37 -07:00
Irfan Sheriff
267a6181a5
Merge "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"" into honeycomb-mr2
2011-06-21 14:23:17 -07:00
Irfan Sheriff
bc4ddef479
Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
2011-06-21 14:23:09 -07:00
Irfan Sheriff
58d1bb497e
DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
...
This reverts commit fe3b33d4ead06c546202753e38188db5e2eaa7fa.
Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64
2011-06-21 11:38:23 -07:00
Bruno Oliveira
f1c71771a2
am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
...
* commit 'da61eab862dabe00f95c784a01c019e4f7776b23':
Integrating RandomMusicPlayer sample into tree.
2011-06-21 11:11:18 -07:00
Bruno Oliveira
da61eab862
Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
2011-06-21 11:07:47 -07:00
Irfan Sheriff
7dd1200589
DO NOT MERGE Revert "Fix lease duration handling"
...
This reverts commit 56878760c3f0255dbcc8d78572f784b96ee36cb0.
2011-06-21 11:01:54 -07:00
Scott Main
a663299213
am 04295266: add api level 13 flag for docs
...
* commit '04295266b03f3c588b8be6b6be409d59f757b27b':
add api level 13 flag for docs
2011-06-21 10:31:09 -07:00
Scott Main
04295266b0
add api level 13 flag for docs
...
Change-Id: I03a7739c923b1f38de6b4e77374daed438559548
2011-06-21 10:17:18 -07:00