OSDN Git Service
Wink Saville [Mon, 25 Jul 2011 22:26:56 +0000 (15:26 -0700)]
Filter out addresses that are 0.
If the address is "any" address, i.e. an address which is all zeros
for both IPv4 and IPv6 ignore it.
Bug:
5073048
Change-Id: I8b9f64103aaffd001114a672375ff5f99616c327
Wink Saville [Sun, 24 Jul 2011 16:11:28 +0000 (09:11 -0700)]
Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
Kazuhiro Ondo [Sun, 24 Jul 2011 15:08:38 +0000 (08:08 -0700)]
Allow suggestedRetryTime to indicate no retry is needed.
If suggestedRetryTime is 0x7fffffff then no retry is needed
and the framework should not initiate a retry.
Bug:
4949208
Change-Id: I3756ef6a3e93beec4ee95863cbc111b9952e5e06
Kazuhiro Ondo [Fri, 22 Jul 2011 01:13:52 +0000 (20:13 -0500)]
Configure RAT dependent retry pattern in GSM DCT.
In case GSM DCT is used with EHRPD, retry pattern should follow
the ones for CDMA.
Bug:
5058426
Change-Id: Id9badc9ac14fb20ac62c1746061f056fa2f9ed1b
Svetoslav Ganov [Sat, 23 Jul 2011 00:05:26 +0000 (17:05 -0700)]
Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE
Robert Greenwalt [Fri, 22 Jul 2011 18:55:33 +0000 (11:55 -0700)]
Add better routes for secondary DNS
We'd been doing no-gateway hostroutes for dns servers on secondary nets, but on
some devices (multi-homed stingray) this is a problem. Add gateway-ed hostroutes
instead so the BP can do it's nonstandard "magical" demultiplexing.
bug:
5011392
Change-Id: Ia48f69c8ddf2a37cfb8f014f078f96bf601d2ddb
Svetoslav Ganov [Mon, 27 Jun 2011 19:38:29 +0000 (12:38 -0700)]
DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
CHERRY PICK FROM MASTER
1. AccessibilityInjectorTest changes the key bindings and when done
restores the defatult ones. The restoreation was not working.
bug:
4905620
Change-Id: I812bad0b748637ded0ce69ace12517511f62f726
Kazuhiro Ondo [Wed, 20 Jul 2011 23:55:47 +0000 (18:55 -0500)]
Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
Fix to resolve conflicting ERI and CSIM SPN. CSIM SPN should be
only used when camping SID/NID is listed in CDMAHOME record.
Bug:
5057486
Change-Id: I6c5961bb53cc6257237fa5a93a0acd067b12d009
Wink Saville [Tue, 19 Jul 2011 19:37:18 +0000 (12:37 -0700)]
Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
Kazuhiro Ondo [Tue, 19 Jul 2011 01:01:04 +0000 (20:01 -0500)]
Return IMEI SV if CDMA-LTE mode is used
IMEI and IMEI SV should be available in CDMA-LTE hybrid system.
IMS SV value is not yet returned.
Bug:
5042972
Change-Id: I733825e95f802605e06887951e226d26baea8ff2
Kazuhiro Ondo [Tue, 19 Jul 2011 16:23:37 +0000 (11:23 -0500)]
Fix FeatureUser leak in ConnectivityService
In case infinite restoral timer is used for a network feature,
FeatureUser could be keep added but never released if a user
is keep calling "startUsingNetworkFeature".
This patch will add duplication check when adding a FeatureUser
into the list in case infinite restoral timer is used.
Bug:
5043513
Change-Id: I47e7076e217f201454fae33ce596ecdc63cf7908
Wink Saville [Mon, 18 Jul 2011 18:32:55 +0000 (11:32 -0700)]
Add LteOnCdmaDevice system property.
Provide a system property which may be
optionally set at build time.
Change-Id: I253ff0df7c8f8c5627c775fb0cff2cb831157eed
Robert Greenwalt [Fri, 15 Jul 2011 16:45:08 +0000 (09:45 -0700)]
Small fix to
5008973 fix.
Removed redundent log.
Cleaned some logic.
Will try to modify route even if recursive operation had an error.
bug:
5008973
Change-Id: Ie2ca51cc39cfac027a8a2e2eaddcb7d6c378c4da
Robert Greenwalt [Thu, 14 Jul 2011 21:28:05 +0000 (14:28 -0700)]
Apply the dns and route diff which we get a change
bug:
5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc
John Wang [Thu, 14 Jul 2011 20:59:10 +0000 (13:59 -0700)]
Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
John Wang [Fri, 8 Jul 2011 19:31:08 +0000 (12:31 -0700)]
Show SIM blocked after 10 time puk wrong entries.
After user enters 10 time wrong puk in puk unlock screen,
device need show the SIM permanently disabled message
is in lock screen.
bug:
4905509
Change-Id: I06242834972b3f403cfe99a2edd8bae47d7ed474
Wink Saville [Wed, 13 Jul 2011 21:15:19 +0000 (14:15 -0700)]
Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
Wink Saville [Wed, 13 Jul 2011 20:44:13 +0000 (13:44 -0700)]
Remove STOPSHIP but allow seamless Handoff when possible.
If an address is removed we must reset the connection but
only for the connections associated with that address. For
now we're doing the "all" addresses for a type (IPv6 or IPv4)
in the future we only need to reset a particular addresses
connections.
Bug:
4981919
Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9
John Wang [Wed, 13 Jul 2011 17:17:22 +0000 (10:17 -0700)]
Merge "Add getImei() to Phone interface." into honeycomb-LTE
John Wang [Mon, 11 Jul 2011 23:50:10 +0000 (16:50 -0700)]
Add getImei() to Phone interface.
Need IMEI to be displayed in LTE Settings. Since getDeviceId() returns MEID for LTE device,
getImei() is added to return IMEI for all devices. getImei returns null if not set (as SipPhone).
bug:
4983512
Change-Id: Idfe2ec8de514f330248db7a9de7e241f9a38cb96
Scott Main [Mon, 11 Jul 2011 23:06:25 +0000 (16:06 -0700)]
am
e32c49ab: docs: de-new sidenavs
* commit '
e32c49ab2c5d6b347b39635a0202d7dbdc1f0769':
docs: de-new sidenavs
Robert Ly [Mon, 11 Jul 2011 23:03:30 +0000 (16:03 -0700)]
am
10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '
10a36020e3d37ef088f5f7ed6d64ba35847fc069':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
Scott Main [Mon, 11 Jul 2011 22:36:21 +0000 (15:36 -0700)]
docs: de-new sidenavs
Change-Id: I2aaafe763e4b006059222677e563963d3284d314
Robert Ly [Thu, 23 Jun 2011 18:47:37 +0000 (11:47 -0700)]
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
Change-Id: I4cb22b628978c86b5c07ff80b2fe8547e25015a1
Scott Main [Mon, 11 Jul 2011 22:50:16 +0000 (15:50 -0700)]
am
d3fa7bd1: docs: fix date on opengl dashboard
* commit '
d3fa7bd1e873d885f00b11bb8123284357ccd362':
docs: fix date on opengl dashboard
Scott Main [Mon, 11 Jul 2011 22:47:41 +0000 (15:47 -0700)]
docs: fix date on opengl dashboard
Change-Id: I0d4443664fb61466de441c1be702a351fbf28ac1
Xavier Ducrohet [Mon, 11 Jul 2011 19:43:15 +0000 (12:43 -0700)]
Xavier Ducrohet [Fri, 8 Jul 2011 18:55:00 +0000 (11:55 -0700)]
Merge
36a3a392 from mr1.
Protect against OOB index in BridgeTypedArray.
Change-Id: I40be1e039f9eb36c182b6522bd50d6ed98e15b5c
Chia-chi Yeh [Mon, 11 Jul 2011 17:25:28 +0000 (10:25 -0700)]
Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
Wink Saville [Mon, 11 Jul 2011 02:33:54 +0000 (19:33 -0700)]
Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
Kazuhiro Ondo [Sat, 9 Jul 2011 21:01:10 +0000 (16:01 -0500)]
Add a property so that CSIM provision check can be bypassed
To support test environment where a call box is used with
non-provisioned SIM.
Bug:
5010622
Change-Id: I0dd2d3c2d199f600e5979c865f97b41e2fbb706d
Kazuhiro Ondo [Sat, 9 Jul 2011 18:20:37 +0000 (13:20 -0500)]
Fix incorrect ERI banner format
Fix conflicting display issue with ERI and CSIM SPN test.
Do not display them together but only override ERI text with CSIM
SPN in home area.
Bug:
5008969
Change-Id: I88383acd1c7f4c5bfb1f66349ff2f37b2edbbc9c
Kazuhiro Ondo [Tue, 5 Jul 2011 21:12:10 +0000 (16:12 -0500)]
Concurrent multi-PDP support in TrafficStats
Quick fix to enable concurrent multiple PDP support in TrafficStats.
Just updated the list of hard-coded mobile interfaces for now.
Bug:
4553527
Change-Id: I44ce73f3000542d6457f353bb561a2275684af6b
Chia-chi Yeh [Sat, 9 Jul 2011 00:59:54 +0000 (17:59 -0700)]
VpnService: stop VPN when unknown DNS servers show up.
Bug:
5002601
Change-Id: I5459db009e7391ff874623cb1830065ac75c80ed
Robert Ly [Fri, 8 Jul 2011 17:39:46 +0000 (10:39 -0700)]
am
3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
* commit '
3f3b8cbfa775f2ebff985c069300f8daaeb7a84c':
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
Robert Ly [Fri, 8 Jul 2011 17:13:28 +0000 (10:13 -0700)]
Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2
Joe Malin [Fri, 8 Jul 2011 16:39:25 +0000 (09:39 -0700)]
am
0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit '
0e89d916f078a518093c476725fa7e0798dcc590':
DOC CHANGE: Change GTV info on intro page
Joe Fernandez [Fri, 8 Jul 2011 16:39:22 +0000 (09:39 -0700)]
am
0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
* commit '
0fbe1dfb8df94a51d79e9a42fcbaebed6f6e516e':
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
Wink Saville [Fri, 8 Jul 2011 05:00:56 +0000 (22:00 -0700)]
Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE
Joe Malin [Fri, 8 Jul 2011 01:19:18 +0000 (18:19 -0700)]
Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
Ramesh Sudini [Wed, 29 Jun 2011 16:43:27 +0000 (11:43 -0500)]
Disconnect ApnContexts in INITING state when error.
When DCT tears down a link due to error, the ApnContexts which are in INITING state are
not torndown. Due to this the DC refCount does not hit 0, and the Data Link is not torndown.
Bug:
4973894
Change-Id: If1263f360d55f6874220235fede294909db4837e
Wink Saville [Thu, 7 Jul 2011 23:17:06 +0000 (16:17 -0700)]
Use resetConnections with resetMask.
Bug:
4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694
Joe Fernandez [Thu, 7 Jul 2011 22:03:55 +0000 (15:03 -0700)]
Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2
Wink Saville [Thu, 7 Jul 2011 21:39:23 +0000 (14:39 -0700)]
Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
Wink Saville [Thu, 7 Jul 2011 21:16:30 +0000 (14:16 -0700)]
No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
Update comment that values should be changed after releasing.
Change-Id: I10ed6a0238e4f5be866dd97cfb56c5e7c84ddb52
Scott Main [Thu, 7 Jul 2011 17:13:44 +0000 (10:13 -0700)]
am
40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit '
40afb97c3289cd3daae9a31f4829d660ba747d37':
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
Scott Main [Thu, 7 Jul 2011 17:10:29 +0000 (10:10 -0700)]
am
77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '
77dfe2173e2970a6a662b7d9537715c81886185e':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
Scott Main [Thu, 19 May 2011 01:47:40 +0000 (18:47 -0700)]
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896
docs: add button builder for android market apps
Change-Id: I0d9da685f850f92737c2d9d3eb758b41dbec0a39
Scott Main [Thu, 7 Jul 2011 16:49:44 +0000 (09:49 -0700)]
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb
docs: update dashboards
Change-Id: Ib37f2b8a3bf8c9c7ae09ea2edbeeb707899abf58
Wink Saville [Thu, 7 Jul 2011 02:04:30 +0000 (19:04 -0700)]
Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
Kazuhiro Ondo [Sat, 2 Jul 2011 18:34:13 +0000 (13:34 -0500)]
Reset FAILED ApnContext state to IDLE on data setup triggers
Make sure FAILED ApnContext state is reset to IDLE regarless of
existence of the reconnect alarm. This is to let FW re-evaluate
call setup conditions properly on data setup triggers.
Bug:
4989604
Change-Id: Ia9ec439db1df03bbd2e56803d3558542ba5f5400
Robert Ly [Thu, 7 Jul 2011 01:17:53 +0000 (18:17 -0700)]
am
ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
* commit '
ad2724de956955b0ddf95491f6cb378f54dafde5':
cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
Robert Ly [Thu, 7 Jul 2011 00:47:47 +0000 (17:47 -0700)]
cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
Change-Id: I763f02a523c7467e7c0241197e8f2652ed7d4f9c
Kazuhiro Ondo [Fri, 1 Jul 2011 20:23:37 +0000 (15:23 -0500)]
Bring back ERI into CDMA-LTE mode
Use ERI mechanism for roaming determination in CDMA-LTE mode.
Also display SPN name from CSIM card as "SPN" field in the status bar.
PLMN field will be derived from ERI text as done in original CDMA phone.
Bug:
4970448
Change-Id: I21382b15e148a8451f4c3fcbbb5d1ed296e41b5a
Joe Fernandez [Wed, 22 Jun 2011 16:48:59 +0000 (09:48 -0700)]
cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
Change-Id: I6401f568ec132d959d57f32caa8b45b2613229e6
Robert Ly [Wed, 6 Jul 2011 18:16:19 +0000 (11:16 -0700)]
cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
Change-Id: I57ea8e2ace24a777603513340302265138711590
Wink Saville [Wed, 6 Jul 2011 19:08:05 +0000 (12:08 -0700)]
Merge "Allow vril-dump to work on user builds" into honeycomb-LTE
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
John Michelau [Tue, 5 Jul 2011 20:20:03 +0000 (15:20 -0500)]
Allow vril-dump to work on user builds
Run vril-dump without "su root" when ro.build.type=user. Also add inet
perms for dumpstate, so that it can communicate with basebands that
have IP-based interfaces.
Bug:
4993955
Change-Id: Icc65ba0f80756db1f63f12f89f9973a55bf405f2
Joe Malin [Wed, 29 Jun 2011 22:17:49 +0000 (15:17 -0700)]
DOC CHANGE: Change GTV info on intro page
Change-Id: I5175d96bd8aa88bf65d8cd0e8bffb4eae7241ebe
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