Mike Lockwood
f8d13e535c
am bf676d46: am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
...
* commit 'bf676d460d1d1fc8923982006c38d0f6785daea8':
GPS: Changes to enable on-demand data call flow for CDMA connections
2011-07-28 13:27:27 -07:00
Mike Lockwood
0ff79e88e2
Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
2011-07-28 13:13:35 -07:00
Robert Greenwalt
af75fdb165
resolved conflicts for merge of 41394a36 to honeycomb-plus-aosp
...
Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3
2011-07-27 09:27:00 -07:00
Robert Greenwalt
41394a3610
Merge "Use dns proxy a bit." into honeycomb-LTE
2011-07-26 13:21:09 -07:00
Robert Greenwalt
572b7048a6
Use dns proxy a bit.
...
Sets the current default interface and sets the dns per interface.
port of changes 23041 and 22098 from opensource.
bug:5060618
Change-Id: I80e7ef88727eeb8ff2b48059f69b270e5a6b5c16
2011-07-25 17:00:13 -07:00
Dianne Hackborn
1b20abd30c
am 20bf46af: am b0878223: am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
...
* commit '20bf46af14130314ae1aeb1e5482c38556c8f0f8':
frameworks/base: Cap the number of toasts that a package can post.
2011-07-25 12:21:32 -07:00
Dianne Hackborn
6d21aee882
am 9ce1ecdf: am 1a2fcea1: am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
...
* commit '9ce1ecdfde98c7b5b5ec346b883df0a50d9722e1':
frameworks/base: unlink death notifications of Vibrate requests
2011-07-25 12:21:29 -07:00
Robert Greenwalt
a7f68230be
resolved conflicts for merge of 26ecc31f to honeycomb-plus-aosp
...
Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9
2011-07-25 12:08:19 -07:00
Robert Greenwalt
1993391694
am ad55d351: Add better routes for secondary DNS
...
* commit 'ad55d35114237071133eb28ded93a014185d4e35':
Add better routes for secondary DNS
2011-07-22 13:15:56 -07:00
Robert Greenwalt
ad55d35114
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
2011-07-22 12:52:21 -07:00
Dianne Hackborn
b0878223db
am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
...
* commit '6800a80199477c90fc64af7211a177de06478a02':
frameworks/base: Cap the number of toasts that a package can post.
2011-07-21 22:35:32 -07:00
Dianne Hackborn
1a2fcea1a2
am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
...
* commit '2f4698fda46a3d2a6e78019588d77bae1cfa7193':
frameworks/base: unlink death notifications of Vibrate requests
2011-07-21 22:23:46 -07:00
Dianne Hackborn
6800a80199
Merge "frameworks/base: Cap the number of toasts that a package can post."
2011-07-21 22:21:19 -07:00
Dianne Hackborn
2f4698fda4
Merge "frameworks/base: unlink death notifications of Vibrate requests"
2011-07-21 22:18:47 -07:00
Robert Greenwalt
594745abef
am b9f87f19: Merge "First pass tying into per-interface DNS cache"
...
* commit 'b9f87f1970217d24213c8e3dd7755a0e4d82f8eb':
First pass tying into per-interface DNS cache
2011-07-21 11:28:01 -07:00
Robert Greenwalt
1efe4d5cfd
First pass tying into per-interface DNS cache
...
Change-Id: Iacce225d392786e37fa2dbf9647045fca0b70e64
2011-07-20 14:47:41 -07:00
Wink Saville
57aebc6109
am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE
...
* commit 'f679d4cb92b6d1c193a154abb5ae8fb3a786fc43':
Fix FeatureUser leak in ConnectivityService
2011-07-19 12:39:42 -07:00
Kazuhiro Ondo
3bed4c9f50
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
2011-07-19 12:02:01 -07:00
Robert Greenwalt
e1635197bb
am 476f5525: Small fix to 5008973 fix.
...
* commit '476f55253adc670d7290ad8c90b5adc9e4f58d3b':
Small fix to 5008973 fix.
2011-07-15 10:20:48 -07:00
Robert Greenwalt
8550f3b86a
resolved conflicts for merge of 0a46db5d to honeycomb-plus-aosp
...
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
2011-07-15 09:55:48 -07:00
Robert Greenwalt
476f55253a
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
2011-07-15 09:45:08 -07:00
Robert Greenwalt
0a46db5d88
Apply the dns and route diff which we get a change
...
bug:5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc
2011-07-14 18:12:14 -07:00
Wink Saville
3810361e4a
am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
...
* commit '6d1d16c324a681dd966d47497a71a02eac512234':
Remove STOPSHIP but allow seamless Handoff when possible.
2011-07-13 14:19:12 -07:00
Wink Saville
e822225f7a
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
2011-07-13 13:44:13 -07:00
Wink Saville
e4a56a32ac
am 8171e6f6: Use resetConnections with resetMask.
...
* commit '8171e6f690cca1bad354e7e352823d79d420daf3':
Use resetConnections with resetMask.
2011-07-08 09:40:08 -07:00
Wink Saville
8171e6f690
Use resetConnections with resetMask.
...
Bug: 4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694
2011-07-07 16:17:06 -07:00
Robert Greenwalt
37dbfcaf83
am 7022db4c: am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface"
...
* commit '7022db4cd2ca3721631595d7379eabb2cc77f6a9':
Added methods to support dns cache per interface
2011-07-06 07:48:21 -07:00
Robert Greenwalt
2b62c4fbfe
am 38bb0123: Merge "Added methods to support dns cache per interface"
...
* commit '38bb0123b8b9857c3119fd359739daf872f619d6':
Added methods to support dns cache per interface
2011-07-06 07:35:02 -07:00
Robert Greenwalt
38bb0123b8
Merge "Added methods to support dns cache per interface"
2011-07-01 09:26:50 -07:00
Dianne Hackborn
06ca9b90e6
am fa5e3b65: am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2
...
* commit 'fa5e3b658f3f42eabec82c9f8e44d8a4cc565249':
DO NOT MERGE. Fix density compat mode.
2011-06-24 12:43:44 -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
Wink Saville
7eff4bb3f9
am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE
...
* commit 'f49e4d3f182071081537dba3387db20cae27c427':
Temporary re-enabling iface name change handling on HO
2011-06-23 18:25:38 -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
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
Robert Greenwalt
0e0a759734
am 1d6ffd73: Merge "Restrict access to protected networks." into honeycomb-LTE
...
* commit '1d6ffd7339c3dfa53de19e27ca09e57233cc25ef':
Restrict access to protected networks.
2011-06-23 08:19:48 -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
Conley Owens
587e9563d6
am c1b62e3b: am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
...
* commit 'c1b62e3ba91d69dd75569b480aec55be8f808331':
Check if we are in daylight time when calculating timezone
2011-06-20 13:20:49 -07:00
Conley Owens
c1b62e3ba9
am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
...
* commit 'bf5adfa5e558827fbb4771720433887bb3cbaefd':
Check if we are in daylight time when calculating timezone
2011-06-20 13:04:45 -07:00
Robert Greenwalt
7a652bc86a
resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp
...
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
2011-06-20 12:15:24 -07:00
Robert Greenwalt
ccf83af101
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
2011-06-20 11:09:23 -07:00
Conley Owens
bf5adfa5e5
Merge "Check if we are in daylight time when calculating timezone"
2011-06-20 11:01:41 -07:00
Robert Greenwalt
241b65aca9
am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
...
* commit '5f3505121b761dbd3bba62d1603fbab49de139b9':
Reset connections AFTER we take down the network.
2011-06-16 12:42:15 -07:00
Robert Greenwalt
5f3505121b
Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
2011-06-16 11:34:03 -07:00
Robert Greenwalt
ec896c6a86
Reset connections AFTER we take down the network.
...
If you do it before you have a race condition and some apps will
manage to reconnect on the dieing network before it goes and then
get no notification when it goes.
bug: 3408025
Change-Id: I5386ff313c759b3f687bc38731454ab43dbe76b8
2011-06-16 11:26:54 -07:00
Dianne Hackborn
d00bebb005
am abe5bd23: am a9551706: Testing done, compatibility mode no longer on by default.
...
* commit 'abe5bd23c341da035e9905d9e50c1d6bccf229dc':
Testing done, compatibility mode no longer on by default.
2011-06-14 21:50:56 -07:00
Dianne Hackborn
abe5bd23c3
am a9551706: Testing done, compatibility mode no longer on by default.
...
* commit 'a9551706a279a798c91d8ef593b2acb16a30c682':
Testing done, compatibility mode no longer on by default.
2011-06-14 21:47:51 -07:00
Dianne Hackborn
a9551706a2
Testing done, compatibility mode no longer on by default.
...
Change-Id: I5bcc98d2b3a1a02ca788ab61440f0aa5d4f7fb4e
2011-06-14 21:05:03 -07:00
Dianne Hackborn
27bad6f33b
am baa89d38: am f930232f: Fix a major problem in fragment lifecycle.
...
* commit 'baa89d3839f70bd31e5219c636ac24a4cc29928d':
Fix a major problem in fragment lifecycle.
2011-06-14 20:57:48 -07:00
Dianne Hackborn
baa89d3839
am f930232f: Fix a major problem in fragment lifecycle.
...
* commit 'f930232fd1c8d301d91853c8fe5dca43979ac807':
Fix a major problem in fragment lifecycle.
2011-06-14 20:54:40 -07:00
Dianne Hackborn
f930232fd1
Fix a major problem in fragment lifecycle.
...
When animating away a fragment, we were not putting it through
the last part of its lifecycle (onDestroy() etc).
Also, retained fragments that have a target were broken. Oops.
Change-Id: I5a669b77a2f24b581cde2a0959acf62edb65e326
2011-06-14 20:47:44 -07:00