OSDN Git Service
Robert Ly [Wed, 6 Jul 2011 18:22:20 +0000 (11:22 -0700)]
am
205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
* commit '
205d1c34e3289b05700e6caab718de169ad82b90':
cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
Kazuhiro Ondo [Thu, 30 Jun 2011 20:34:56 +0000 (15:34 -0500)]
DataConnection was cleaned up too early if it's already disconnecting
Fix one logic failure introduced in patch for bug
4901019.
Bug:
4970726
Change-Id: Ifc4071b1cbf0c19fbd8356d7dcc16f9df39d4b54
Robert Greenwalt [Thu, 30 Jun 2011 19:24:26 +0000 (12:24 -0700)]
Don't ever report a null ServiceState
Report out of service if we don't know any better. Sometimes when switching radios
we were finding nulls reported - it crashed some code and highlighted this problem.
If we don't have a service state we're certainly out of service, so this isn't a lie.
bug:
4553701
Change-Id: I094798a5f9f39f45c0ba30179aaa8f88f9b3e405
Kazuhiro Ondo [Wed, 29 Jun 2011 02:15:17 +0000 (21:15 -0500)]
Make sure to update data availability in call setup capable triggers.
As "startUsingNetworkFeature()" now can trigger the initial data
connection instead of default data, FW needs to make sure each
MobileDataStateTracker is updated with the data availability
on each "data-setup capable" trigger.
Bug:
4970825
Change-Id: I6a7e479ecc1534cd723a2e8beece6b8bcd398ea7
Robert Greenwalt [Wed, 29 Jun 2011 21:24:02 +0000 (14:24 -0700)]
Fix dependencyMet issues regarding hipri APN.
If the system says a dependency isn't met for accessing the default APN,
apps should not be able to turn on the hipri APN either. This change
prevents apps from adjusting the dependencyMet setting on hipri and
internally ties its dependencyMet to that of the default APN.
bug:
4643411
Change-Id: I7e609ff9bb1b85a3a6a41095052f0194d03be979
Robert Ly [Tue, 28 Jun 2011 20:13:14 +0000 (13:13 -0700)]
cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
Change-Id: If1091fd0a7934440e73731825d24ab8c519656ab
Scott Main [Wed, 29 Jun 2011 03:50:12 +0000 (20:50 -0700)]
am
a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
* commit '
a687045045157eab2dbf657bb085cb0af68d72f2':
cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
Scott Main [Wed, 29 Jun 2011 03:25:43 +0000 (20:25 -0700)]
cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e
docs: fix game controller trademarks
Change-Id: I1eca030bad5bae0c581000fefffd5d3d49aac205
Wink Saville [Tue, 28 Jun 2011 02:54:27 +0000 (19:54 -0700)]
Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE
Dianne Hackborn [Tue, 28 Jun 2011 00:07:29 +0000 (17:07 -0700)]
am
5db9ff97: Update final 13 API def.
* commit '
5db9ff97aa8f36f330f41f5ae42467795ef075b8':
Update final 13 API def.
Kazuhiro Ondo [Wed, 22 Jun 2011 22:26:08 +0000 (17:26 -0500)]
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
Dianne Hackborn [Mon, 27 Jun 2011 22:09:40 +0000 (15:09 -0700)]
Update final 13 API def.
Change-Id: I90cb38f575dd1b92a3694bb5cd091f5d595cee11
Robert Ly [Mon, 27 Jun 2011 18:49:30 +0000 (11:49 -0700)]
am
81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2
* commit '
81cbc294ddb08c2bc08be9b2abbbcc7c19ec88d9':
docs: fixing new superscript for rs
Robert Ly [Mon, 27 Jun 2011 18:45:41 +0000 (11:45 -0700)]
Merge "docs: fixing new superscript for rs" into honeycomb-mr2
Robert Ly [Mon, 27 Jun 2011 17:33:01 +0000 (10:33 -0700)]
docs: fixing new superscript for rs
Change-Id: I0563842a3a43972b131a2ec30ed8357b8136fc6d
Anirudh Dewani [Mon, 27 Jun 2011 06:06:04 +0000 (23:06 -0700)]
am
1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2
* commit '
1f82dc08f1616a83d8d1c43fa9ac16d0d60dd537':
Typo in spinner tutorial.
Anirudh Dewani [Mon, 27 Jun 2011 06:02:56 +0000 (23:02 -0700)]
Merge "Typo in spinner tutorial." into honeycomb-mr2
Dianne Hackborn [Fri, 24 Jun 2011 19:26:17 +0000 (12:26 -0700)]
am
2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
* commit '
2dafe771bb7ad4b15db6b740fd3ccb8f0fae836d':
DO NOT MERGE. Fix density compat mode.
Dianne Hackborn [Fri, 24 Jun 2011 19:13:16 +0000 (12:13 -0700)]
Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
Anirudh Dewani [Fri, 24 Jun 2011 11:00:20 +0000 (16:30 +0530)]
Typo in spinner tutorial.
Change-Id: I2bacd7b417c21944703738cd410dc1ec67c1b554
Wink Saville [Fri, 24 Jun 2011 01:21:36 +0000 (18:21 -0700)]
Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE
Kazuhiro Ondo [Thu, 23 Jun 2011 02:10:34 +0000 (21:10 -0500)]
Temporary re-enabling iface name change handling on HO
Temporary accept interface name change in ConnectivityService.
See bug/
4455071.
Bug:
4903011
Change-Id: I7f06c2ca83535b981f047cb671e08550aed7df1a
Scott Main [Thu, 23 Jun 2011 20:12:30 +0000 (13:12 -0700)]
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
Scott Main [Thu, 23 Jun 2011 20:08:27 +0000 (13:08 -0700)]
Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2
Scott Main [Thu, 23 Jun 2011 19:02:10 +0000 (12:02 -0700)]
docs: add emphasis to adding a search button in activity UI
Change-Id: I13c4673cdb8caab65dd8d57046f54b0ae3bf48e2
Dianne Hackborn [Thu, 23 Jun 2011 18:58:50 +0000 (11:58 -0700)]
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
Scott Main [Thu, 23 Jun 2011 19:26:33 +0000 (12:26 -0700)]
am
9a05cfe5: docs: update docs for new screen support attributes and qualifiers
* commit '
9a05cfe5427a6cee988333e0d65f17b9854554a3':
docs: update docs for new screen support attributes and qualifiers
Scott Main [Wed, 22 Jun 2011 18:00:29 +0000 (11:00 -0700)]
docs: update docs for new screen support attributes and qualifiers
Change-Id: I8fdfd90e5d7970bdbb72e0b3271f047f5ed300ee
Scott Main [Thu, 23 Jun 2011 16:28:34 +0000 (09:28 -0700)]
am
1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2
* commit '
1acd2a7f2b263e9d8de23a0d5630d77efe370c80':
docs: add Lenevo driver info
Scott Main [Thu, 23 Jun 2011 16:18:22 +0000 (09:18 -0700)]
Merge "docs: add Lenevo driver info" into honeycomb-mr2
Robert Greenwalt [Thu, 23 Jun 2011 15:04:48 +0000 (08:04 -0700)]
Merge "Restrict access to protected networks." into honeycomb-LTE
Scott Main [Thu, 23 Jun 2011 00:53:12 +0000 (17:53 -0700)]
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
Scott Main [Thu, 23 Jun 2011 00:45:13 +0000 (17:45 -0700)]
Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
Robert Greenwalt [Wed, 22 Jun 2011 00:26:14 +0000 (17:26 -0700)]
Restrict access to protected networks.
Some networks should only be brought up and controlled by system apps.
bug:
4585677
Change-Id: I61b1ee3dcfca0ee54387cecffe5198a0b010d98b
Scott Main [Mon, 20 Jun 2011 23:36:28 +0000 (16:36 -0700)]
docs: add info about manifest attributes that should not change
Change-Id: Ia58d855ccaa3348bc0a2f7a4b7847ec115c442e8
Jerry J. Wang [Wed, 22 Jun 2011 22:11:04 +0000 (15:11 -0700)]
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)
Jerry J. Wang [Wed, 22 Jun 2011 22:08:25 +0000 (15:08 -0700)]
Merge "Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2
Scott Main [Wed, 22 Jun 2011 21:46:43 +0000 (14:46 -0700)]
am
929cba13: docs: remove exclamation from media title
* commit '
929cba1391432eb66329781c866c92a07d3f45ae':
docs: remove exclamation from media title
Katie McCormick [Wed, 22 Jun 2011 21:43:36 +0000 (14:43 -0700)]
am
d4fac2c0: Doc change: updated TOC for Bluetooth CL.
* commit '
d4fac2c0263fda4b20f253edd594cf909e61eb4e':
Doc change: updated TOC for Bluetooth CL.
Scott Main [Wed, 22 Jun 2011 21:43:14 +0000 (14:43 -0700)]
docs: remove exclamation from media title
Change-Id: If89584a6b52c6a0e70e6636e1da260b47c0ca072
Katie McCormick [Fri, 3 Jun 2011 23:50:14 +0000 (16:50 -0700)]
Doc change: updated TOC for Bluetooth CL.
Change-Id: Ifd60e332d3088402e939fc851374800f526f8cdf
Scott Main [Wed, 22 Jun 2011 21:26:10 +0000 (14:26 -0700)]
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
Scott Main [Wed, 22 Jun 2011 21:23:22 +0000 (14:23 -0700)]
Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2
Scott Main [Wed, 22 Jun 2011 19:07:40 +0000 (12:07 -0700)]
docs: use new CSE to show results for all sites
Change-Id: Idd85d78fcdd90381b6f03406a76b13e02d540e37
Robert Ly [Wed, 22 Jun 2011 19:52:25 +0000 (12:52 -0700)]
am
d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
* commit '
d60e1b5b9132c6dba912fd5b4f5d7e12fd816244':
cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
Robert Ly [Wed, 22 Jun 2011 17:24:12 +0000 (10:24 -0700)]
cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
Change-Id: Ib47cf367f5c9ca66da2921fa86078693198a7968
Dave Burke [Wed, 22 Jun 2011 18:49:22 +0000 (19:49 +0100)]
Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
Change-Id: If63fdda72a4399e264eed85e2e190c00f383a52d
Irfan Sheriff [Wed, 22 Jun 2011 18:10:26 +0000 (11:10 -0700)]
am
ecce539f: Merge "Release wakelock after use" into honeycomb-mr2
* commit '
ecce539f3d739fbf4b395639a485fddf51f688d6':
Release wakelock after use
Bruno Oliveira [Wed, 22 Jun 2011 18:10:24 +0000 (11:10 -0700)]
am
f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
* commit '
f5c6236289e9f8a7df6af0bea78887ba2cbf406e':
Rewriting "Audio and Video" section of Dev Guide.
Irfan Sheriff [Wed, 22 Jun 2011 18:10:16 +0000 (11:10 -0700)]
am
41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""
* commit '
41b35884ff68a62f5fc8f65dcc26342d0889113d':
Revert "DO NOT MERGE Revert "Fix lease duration handling""
Irfan Sheriff [Wed, 22 Jun 2011 18:01:16 +0000 (11:01 -0700)]
resolved conflicts for merge of
914ed90f to honeycomb-LTE
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
Irfan Sheriff [Wed, 22 Jun 2011 14:27:39 +0000 (07:27 -0700)]
Merge "resolved conflicts for merge of
267a6181 to honeycomb-LTE" into honeycomb-LTE
Irfan Sheriff [Wed, 22 Jun 2011 05:46:51 +0000 (22:46 -0700)]
resolved conflicts for merge of
267a6181 to honeycomb-LTE
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
Wink Saville [Wed, 22 Jun 2011 02:32:36 +0000 (19:32 -0700)]
Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE
Wink Saville [Wed, 22 Jun 2011 02:32:25 +0000 (19:32 -0700)]
Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE
Wink Saville [Wed, 22 Jun 2011 02:32:16 +0000 (19:32 -0700)]
Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE
Wink Saville [Wed, 22 Jun 2011 02:32:05 +0000 (19:32 -0700)]
Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE
Irfan Sheriff [Wed, 22 Jun 2011 02:17:27 +0000 (19:17 -0700)]
Merge "Release wakelock after use" into honeycomb-mr2
Kazuhiro Ondo [Tue, 21 Jun 2011 02:46:21 +0000 (21:46 -0500)]
Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
Bug:
4764057
Change-Id: I0c7d6e2af6a597d70d2024205d358e8b9c56b57b
Wink Saville [Wed, 22 Jun 2011 00:58:45 +0000 (17:58 -0700)]
Use dataConnectionNotInUse to decide if a DC is free.
Change-Id: I89cb2f46dca59d5738dd16eb657104c3158ebcd2
Bruno Oliveira [Tue, 21 Jun 2011 23:44:56 +0000 (16:44 -0700)]
Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2
Kazuhiro Ondo [Fri, 17 Jun 2011 21:35:55 +0000 (16:35 -0500)]
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
Kazuhiro Ondo [Sun, 19 Jun 2011 18:19:59 +0000 (13:19 -0500)]
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
Bruno Oliveira [Tue, 7 Jun 2011 05:49:30 +0000 (01:49 -0400)]
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
Irfan Sheriff [Tue, 21 Jun 2011 19:23:17 +0000 (12:23 -0700)]
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
Irfan Sheriff [Tue, 21 Jun 2011 21:29:42 +0000 (14:29 -0700)]
am
bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
* commit '
bc4ddef479011e200d0273fe73c22922a85de1fe':
DO NOT MERGE Revert "Fix lease duration handling"
Irfan Sheriff [Tue, 21 Jun 2011 21:26:59 +0000 (14:26 -0700)]
Revert "DO NOT MERGE Revert "Fix lease duration handling""
This reverts commit
7dd120058972226158176b292c00841efecc259f.
Irfan Sheriff [Tue, 21 Jun 2011 21:26:37 +0000 (14:26 -0700)]
Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
This reverts commit
58d1bb497e0d83e28a02fbcdc1f33f29a992db7e.
Irfan Sheriff [Tue, 21 Jun 2011 21:23:17 +0000 (14:23 -0700)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"" into honeycomb-mr2
Irfan Sheriff [Tue, 21 Jun 2011 21:23:09 +0000 (14:23 -0700)]
Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
Irfan Sheriff [Tue, 21 Jun 2011 18:34:38 +0000 (11:34 -0700)]
DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
This reverts commit
fe3b33d4ead06c546202753e38188db5e2eaa7fa.
Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64
Bruno Oliveira [Tue, 21 Jun 2011 18:11:18 +0000 (11:11 -0700)]
am
da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
* commit '
da61eab862dabe00f95c784a01c019e4f7776b23':
Integrating RandomMusicPlayer sample into tree.
Bruno Oliveira [Tue, 21 Jun 2011 18:07:47 +0000 (11:07 -0700)]
Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2
Irfan Sheriff [Tue, 21 Jun 2011 18:01:54 +0000 (11:01 -0700)]
DO NOT MERGE Revert "Fix lease duration handling"
This reverts commit
56878760c3f0255dbcc8d78572f784b96ee36cb0.
Scott Main [Tue, 21 Jun 2011 17:31:09 +0000 (10:31 -0700)]
am
04295266: add api level 13 flag for docs
* commit '
04295266b03f3c588b8be6b6be409d59f757b27b':
add api level 13 flag for docs
Scott Main [Tue, 21 Jun 2011 17:14:44 +0000 (10:14 -0700)]
add api level 13 flag for docs
Change-Id: I03a7739c923b1f38de6b4e77374daed438559548
Daniel Sandler [Tue, 21 Jun 2011 00:30:38 +0000 (17:30 -0700)]
am
444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2
* commit '
444336dd5f233c59e5a222d366d2498c888664b5':
Fix crazy notification panel background.
Daniel Sandler [Tue, 21 Jun 2011 00:29:24 +0000 (17:29 -0700)]
Merge "Fix crazy notification panel background." into honeycomb-mr2
Scott Main [Tue, 21 Jun 2011 00:28:41 +0000 (17:28 -0700)]
am
bb64fa1e: docs: fix a couple typos
* commit '
bb64fa1e3dde8910397d159eaa300c4444b0073c':
docs: fix a couple typos
Scott Main [Tue, 21 Jun 2011 00:26:48 +0000 (17:26 -0700)]
am
beeb7762: docs: fix broken link
* commit '
beeb776209446ea45252af5bbc1fe8a463b2001b':
docs: fix broken link
Scott Main [Tue, 21 Jun 2011 00:22:50 +0000 (17:22 -0700)]
docs: fix a couple typos
Change-Id: I65e9b59eb48985f21eeea5d0d944b0d8e8b92023
Scott Main [Tue, 21 Jun 2011 00:17:39 +0000 (17:17 -0700)]
docs: fix broken link
Change-Id: I5ac2eed824cef817d309b4e4794c430882db5de8
Scott Main [Mon, 20 Jun 2011 22:50:12 +0000 (15:50 -0700)]
docs: add Lenevo driver info
Change-Id: I5ffe82d26375c76cccd3aaa493448de454cdab1c
Robert Greenwalt [Mon, 20 Jun 2011 21:15:56 +0000 (14:15 -0700)]
Just a random fix.
Don't re-lookup something - use the local holding the early lookup.
Change-Id: I6d9fac89651c99a84060238c8a6f6a936b1167ea
Robert Greenwalt [Mon, 20 Jun 2011 18:47:49 +0000 (11:47 -0700)]
Merge "Fix tethering upstream determination." into honeycomb-LTE
Daniel Sandler [Mon, 20 Jun 2011 18:44:35 +0000 (14:44 -0400)]
Fix crazy notification panel background.
The compatibility mode dialog (shown only once, ever) was clobbering its layout params.
Bug:
4723617
Change-Id: I7899293b72c8e480a97a10a88f62754ff415f343
Robert Greenwalt [Fri, 3 Jun 2011 00:30:47 +0000 (17:30 -0700)]
Fix tethering upstream determination.
Used to use iface names, but on mobile ifaces are multipurpose.
Refined to use ConnectivityService types.
bug:
4530116
Change-Id: Iaa632d5f540d27ffff683bd7d94f8004bf422e71
Robert Ly [Mon, 20 Jun 2011 16:44:59 +0000 (09:44 -0700)]
am
c7c1ba50: Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
* commit '
c7c1ba5071456a813abbdadfdbe94287b06877e7':
cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
Robert Ly [Mon, 20 Jun 2011 16:44:55 +0000 (09:44 -0700)]
am
329e0b90: Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
* commit '
329e0b9020f3b8cd1265c265cdf00b438960cbe1':
cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
Robert Ly [Mon, 20 Jun 2011 16:37:51 +0000 (09:37 -0700)]
Merge "cherrypick from hc-mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2
Robert Ly [Mon, 20 Jun 2011 16:37:36 +0000 (09:37 -0700)]
Merge "cherrypick from hc-mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2
Mathias Agopian [Fri, 17 Jun 2011 01:09:56 +0000 (18:09 -0700)]
am
e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '
e7d3ee9d81de13e992c7d063ca472d480956b0c6':
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Mathias Agopian [Fri, 17 Jun 2011 00:15:51 +0000 (17:15 -0700)]
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Also revert all dependent changes:
This reverts commit
8e18668d14adf601cbe5973030c310ec23d88461.
This reverts commit
69b4587bfbb3e98f793959d9123340360fa233a2.
This reverts commit
a9c9a4baf24700e8817d47d8ea8da1742caea0b5.
This reverts commit
2c0042b666a969091c931614f2fc0dce2f1cfac8.
This reverts commit
f6c8206735e7e078461e5f2aef6e1a1446fdd075.
This reverts commit
24855c09173a6caaec7dcedd0c2d7ce15121d39b.
Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
John Wang [Thu, 16 Jun 2011 23:50:05 +0000 (16:50 -0700)]
am
c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit '
c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
Revert "Do not merge. Return null id for Non-phone device."
John Wang [Thu, 16 Jun 2011 23:47:18 +0000 (16:47 -0700)]
Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
John Wang [Thu, 16 Jun 2011 23:30:02 +0000 (16:30 -0700)]
Revert "Do not merge. Return null id for Non-phone device."
This reverts commit
cea03df201dc6659654234bc5fbfebf1b6a06e42
Dianne Hackborn [Thu, 16 Jun 2011 22:22:10 +0000 (15:22 -0700)]
am
2f04883f: SDK only: integrate new sample code, deprecating along the way.
* commit '
2f04883ff880966d63d1aa4a1c7b05e497cfcc58':
SDK only: integrate new sample code, deprecating along the way.
Dianne Hackborn [Thu, 16 Jun 2011 20:31:57 +0000 (13:31 -0700)]
SDK only: integrate new sample code, deprecating along the way.
The new support library features and sample code for switching
between fragments using a TabHost now eliminates the utility of
the TabActivity class, so deprecate it. This also means there is
no longer any use in ActivityGroup or LocalActivityManager. Yay.
Also fix up things so the new support API demos are included in
the documentation.
Change-Id: I4f073b82787f32560ba1fa5b6a23746ecc8aecdc
Dianne Hackborn [Thu, 16 Jun 2011 21:49:08 +0000 (14:49 -0700)]
am
abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2
* commit '
abd4dffc86202d48e50bd21807574fa861854dca':
New orientation handling. Only impacts SDK (aapt dump badging).
Dianne Hackborn [Thu, 16 Jun 2011 21:47:53 +0000 (14:47 -0700)]
Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2