Commit Graph

51 Commits

Author SHA1 Message Date
Szymon Jakubczak
c23dbd2557 - updates NetUtils to use new libnetutils headers
- updates WifiStateTracker to track net.XXX.dnsX properties for name servers
- removes dhcp from WifiNative (use NetworkUtils instead)

Change-Id: Ic69ff253e8784cad34e9291e7970ee38bfa235b9
2010-06-15 10:22:25 -07:00
The Android Open Source Project
9b2534cf56 am acfd2380: reconcile main tree with open-source eclair
Merge commit 'acfd23809fb5e3923cdc91c0c674521b94d46bcf' into eclair-plus-aosp

* commit 'acfd23809fb5e3923cdc91c0c674521b94d46bcf':
  android-2.1_r1 snapshot
  Use 128p map tiles for high dpi devices.
  Throttle nitz updates as the are too numerous on cdma.
  don't request a sync when temp providers are created
  Increase light sensor delay from one to two seconds.
  Revert jparks code from IPCThreadState.
  Add a warning when we leave threads in the binder thread pool in the background scheduling group.
  PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
  Fix regression.
  Fix broken build.
  Bluetooth A2DP suspend/resume functionality
  EventLog when a database file is deleted due to corruption.
  Don't forget to clear "backup in progress" state when finishing a pass
  Fix issue #2148939: Sholes slow to wake up in landscape mode
  Fix Cdma re-start of default connection.
  Merge change 26821 into eclair
  Not all WebView's host have permission to read the history.
  Merge change 26908 into eclair
2010-02-05 08:48:38 -08:00
The Android Open Source Project
acfd23809f reconcile main tree with open-source eclair 2010-02-05 08:09:38 -08:00
The Android Open Source Project
5f9ac31c88 reconcile android-2.1_r1 snapshot 2010-01-29 14:09:16 -08:00
Robert Greenwalt
4777fd12d8 am 3cc68d33: Fix the reporting of NO_CONNECTIVITY.
Merge commit '3cc68d3379689b0c970ce33a56749a61a73047bd' into eclair-plus-aosp

* commit '3cc68d3379689b0c970ce33a56749a61a73047bd':
  Fix the reporting of NO_CONNECTIVITY.
2010-01-25 18:56:32 -08:00
Robert Greenwalt
3cc68d3379 Fix the reporting of NO_CONNECTIVITY.
A refactoring of handleDisconnect instroduced a bug - we were reporting
NO_CONNECTIVITY after any non-primary network (supl, mms, hipri) was lost.

bug:2395006

Change-Id: Ifa9e008872ec646981a35f2c316120cb9685a6a4
2010-01-25 17:54:29 -08:00
Robert Greenwalt
0070ee4220 am 5381e4ef: Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair
Merge commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750' into eclair-plus-aosp

* commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750':
  Refine fix I53e91db7 to apply only to wifi network
2010-01-25 16:54:28 -08:00
Robert Greenwalt
24e2d2b0e5 Refine fix I53e91db7 to apply only to wifi network
The original fix eliminated duplicate wifi connectivity changes stemming from
location provder scan's for APs.  These would generate two DISCONNECTED broadcasts every
two minutes and many apps mis-interpreted them.

The fix was to ignore notifications where the major state was the same as the previous one
for each network.  Unfortunately the state of per-apn notifications on cellular is hacky
and so the wifi fix was breaking mms (mms when you're on cellular with a common default+mms apn does
not generate a disconnect notification (apn still connected) so subsequent connect notifications
get dropped as duplicates).

This change refines the previous change so that it only applies to wifi networks.

bug:2392061
Change-Id: I05d8a46a4b55f8d28df8af12e05284e5e68bfc02
drno: ryanpc
2010-01-25 16:23:56 -08:00
Robert Greenwalt
902a8dd611 am 9fdf82e0: Merge "Try to switch to another default net on connection failure." into eclair
Merge commit '9fdf82e080ea20086378e751ace245a4a1b022dc' into eclair-plus-aosp

* commit '9fdf82e080ea20086378e751ace245a4a1b022dc':
  Try to switch to another default net on connection failure.
2010-01-21 10:05:13 -08:00
Robert Greenwalt
f55ced9ef3 Try to switch to another default net on connection failure.
This shouldn't be required, but there seems to be something odd going on
in wifi and it doesn't hurt to try other available options.  Makes a
connection failure case work like a disconnected case.

bug: 2378462
2010-01-20 19:29:41 -08:00
Robert Greenwalt
2b17d4bf67 am 1a337547: Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair
Merge commit '1a337547d5377c57dbb10a24d4d73ad6bda829ea' into eclair-plus-aosp

* commit '1a337547d5377c57dbb10a24d4d73ad6bda829ea':
  Add bugreport info about network feature use. DO NOT MERGE
2010-01-20 13:30:11 -08:00
Robert Greenwalt
bfb89af944 Add bugreport info about network feature use. DO NOT MERGE
Backported from master change Ib9285359.

We've had a couple bug reports showing the effects of a left-live feature request.
We need a bit more bugreport-time logging.

bug: 2323226
bug: 2377507
change-id: I296b2887101c260aea678bf6db91144535cbad7e
2010-01-20 12:36:09 -08:00
Robert Greenwalt
b7df5e2992 am 8c166512: Merge "Cleanup of process-specific DNS." into eclair
Merge commit '8c166512a7e6ffaf87e41cd3a85d55993648fe9b' into eclair-plus-aosp

* commit '8c166512a7e6ffaf87e41cd3a85d55993648fe9b':
  Cleanup of process-specific DNS.
2010-01-20 11:12:40 -08:00
Robert Greenwalt
52855a1a7d Cleanup of process-specific DNS.
Backport of MR2 change 421c72b6.

Removes entries sooner.  A bug.
Doesn't add one for phone process at all.  This was intended to be removed long ago.

bug: 2329900
bug: 2377507
2010-01-19 18:01:36 -08:00
Robert Greenwalt
b954337d20 am 2adbc7f7: Backport l53e91db7 from master.
Merge commit '2adbc7f7a4a4a827360f8a585e7306f07f2fd718' into eclair-plus-aosp

* commit '2adbc7f7a4a4a827360f8a585e7306f07f2fd718':
  Backport l53e91db7 from master.
2010-01-13 17:09:40 -08:00
Robert Greenwalt
2adbc7f7a4 Backport l53e91db7 from master.
Prevents sending out ConnectivityManager broadcasts when the connection
is repeating the same major state.  This means continued wifi scanning
does not generate CM broadcasts (though wifi state broadcasts continue).

bug: 2265222
Dr No approval: jsh
2010-01-13 09:36:31 -08:00
Robert Greenwalt
37ca75d9db am 9ae9763b: Merge change Ib097fbbf into eclair
Merge commit '9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-plus-aosp

* commit '9ae9763b7e5dd872619b13c889b72b0df176f956':
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:31:29 -08:00
Robert Greenwalt
6d7aa196cf DO NOT MERGE Reverting change I53e91db7.
Accidentally submitted into eclair instead of eclair-mr2.
I apparently rebased my mr2 working dir to eclair by mistake.

Do not merge this so the desired change will survive on mr2 as intended.

bug: 2265222
2009-12-07 15:20:50 -08:00
Robert Greenwalt
282c1ed5d3 am 90d1b745: Merge change I53e91db7 into eclair
Merge commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-plus-aosp

* commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
  Filter out minor Connectivity Notifications.
2009-12-07 15:09:30 -08:00
Robert Greenwalt
12c4455532 Filter out minor Connectivity Notifications.
Don't send a connectivity change notification if the change is in detailed state only.
IE, Disconnect/Idle -> Disconnect/Scanning should not trigger a connection change
notification.

bug: 2265222
2009-12-07 14:20:08 -08:00
Jean-Baptiste Queru
c680052751 merge from open-source master
Merge commit 'goog/stage-korg-master^' into HEAD
2009-11-15 14:03:15 -08:00
Jean-Baptiste Queru
2eb29a4ef6 eclair snapshot 2009-11-13 13:53:39 -08:00
Robert Greenwalt
a25fd71875 Turn some logging back on in ConnectionManager
Trimmed a bunch of logging out, but turned it on so we get the critical stuff.

bug: 2168291
2009-10-06 14:12:53 -07:00
Dianne Hackborn
2fdd851867 Work on issue #2163789: Way too much logging
Dr.No from mcleron.

Change-Id: Iaca2268684f83fe8757e64db0b0e047a19755311
2009-10-04 14:48:47 -07:00
Robert Greenwalt
423dbbc68a Reduce the ConnectivityManager logging.
Same great info, just fewer chars.
2009-09-30 22:10:41 -07:00
Robert Greenwalt
affc3a1c31 Fix network-feature timeout code.
Track requests independently with seperate timers.  Clean up on expiration
by just stopping that particular request, not immediately restoring the default.

bug: 2127590
2009-09-29 13:18:17 -07:00
Robert Greenwalt
149d5ac149 Report NO_CONNECTIVITY when failover net unavail
Fix ConnectivityService so that it reports connection status correctly.

bug: 2128595
2009-09-17 16:34:39 -07:00
Robert Greenwalt
4666ed0e7e Fix for multi-apn MMS access.
Mark cellular variants with the same availability, regardless of which are currently in use.
Availability just means the radio is enabled and sees the network, but has no guarantees that
we could connect to an APN if requested.

Fix the requestRouteToHost logic to support apn switches without WIFI.

bug:2093841
2009-09-10 18:01:01 -07:00
Robert Greenwalt
8e5b853511 Fix the removal of dns entries.
When switching default networks we should erase any excess dns server entries.  The old code
used the wrong index and didn't erase all of them properly.

Found in conjunction with
bug: 2077628
2009-08-25 14:00:10 -07:00
Robert Greenwalt
f3f045b284 Fix a race condition for data change notification
We could sometimes not be told about network state changes breaking subsequent mms access.
Turning on more logging too.

bug: 2069106
2009-08-24 16:19:42 -07:00
Robert Greenwalt
a52c75ae24 Fix various issues found when testing Mms.
Fix some race conditions (check isTeardownRequested).
Fix the passing of mInterfaceName to subtypes (mms, etc).
Fix the generation of CONNECTED message to already active subtypes.
Fix the enabling of Data in DataConnectionTracker.

bug: 2065037
2009-08-19 21:58:12 -07:00
Mike Lockwood
fde2b76814 ConnectivityService: Do not send broadcasts until the system is ready.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-14 15:09:11 -04:00
Robert Greenwalt
2034b91973 Add net type to mobile for mobile-required traffic
This also refactors ConnectivityService a bit towards supporting multiple simultaneous connections by making each a seem like a seperate Network with it's own stateTracker, etc.
Also adds tracking of process death to clean orphaned startUsingNetworkFeature features.
2009-08-12 16:08:25 -07:00
Robert Greenwalt
0659da31df Whitespace cleanup prior to real work. 2009-07-16 17:31:20 -07:00
Mike Lockwood
1791998080 wifi: Keep the WLAN network interface up whenever wifi is enabled.
We now only bring it down briefly and bring it back up again when
we want to reset the interface.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-10 17:24:07 -04:00
Jean-Baptiste Queru
b562ab9015 am 6126eafd: reconcile donut snapshot
Merge commit '6126eafdca67313607bd385b2c7f4f9dfe6f76da'

* commit '6126eafdca67313607bd385b2c7f4f9dfe6f76da':
  donut snapshot
2009-05-20 11:49:58 -07:00
Jean-Baptiste Queru
6126eafdca reconcile donut snapshot
Merge branch 'donut-snapshot' into HEAD
2009-05-20 11:28:11 -07:00
Jean-Baptiste Queru
a3fdaf3cc2 donut snapshot 2009-05-20 11:28:04 -07:00
Dianne Hackborn
b771a49a30 merged b1d251acd2 2009-05-06 00:28:37 -07:00
Dianne Hackborn
b1d251acd2 Rewrite SyncStorageEngine to use flat files and in-memory data structures.
The previous implementation used a database for storing all of its state, which could cause
a significant amount of IO activity as its tables were updated through the stages of a sync.
This new implementation replaces that in-memory data structures, with hand-written code
for writing them to persistent storage.

There are now 4 files associated with this class, holding various pieces of its state that
should be consistent.  These are everything from a main XML file of account information that
must always be retained, to a binary file of per-day statistics that can be thrown away at
any time.  Writes of these files as scheduled at various times based on their importance of
the frequency at which they change.

Because the database no longer exists, there needs to be a new explicit interface for
interacting with the sync manager database.  This is provided by new APIs on IContentService,
with a hidden method on ContentResolver to retrieve the IContentService so that various
system entities can use it.  Other changes in other projects are required to update to the
new API.

The goal here is to have as little an impact on the code and functionality outside of
SyncStorageEngine, though due to the necessary change in API it is still somewhat extensive.
2009-05-05 15:40:53 -07:00
Jean-Baptiste Queru
bc565c0a52 Merge donut into master 2009-04-22 18:33:17 -07:00
Jean-Baptiste Queru
5c1ac9dc2b merge cupcake into donut 2009-04-22 17:56:58 -07:00
Jean-Baptiste Queru
66b7286230 Merge donut into master 2009-04-22 17:12:34 -07:00
Eric Shienbrood
418d2d13d3 AI 146222: Manual merge of 145980 from donutburger => master.
Automated import of CL 146222
2009-04-14 15:40:20 -07:00
Eric Shienbrood
77467ef35d AI 145980: am: CL 145881 Adding on to CL 145383, unhiding some additional methods and constants
that ought to be exposed. Hid and deprecated the single-arg public
  constructor for NetworkInfo, and modified a CTS test that was testing it.
  Ran the android.net test package to make sure it still works.
  Original author: ers
  Merged from: //branches/cupcake/...

Automated import of CL 145980
2009-04-13 18:12:47 -07:00
Eric Shienbrood
a445d544ce AI 145881: Adding on to CL 145383, unhiding some additional methods and constants
that ought to be exposed. Hid and deprecated the single-arg public
  constructor for NetworkInfo, and modified a CTS test that was testing it.
  Ran the android.net test package to make sure it still works.
  BUG=1779439

Automated import of CL 145881
2009-04-13 10:41:56 -07:00
The Android Open Source Project
28527d2c5f auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
The Android Open Source Project
ae5a5399b4 auto import from //depot/cupcake/@135843 2009-03-03 18:28:45 -08:00
The Android Open Source Project
cffb11385e auto import from //branches/cupcake/...@130745 2009-02-10 15:44:00 -08:00
The Android Open Source Project
0caef3f9f1 Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00