Merge commit '0070ee42201c3d1c005828234ece3e25e620dcc9'
* commit '0070ee42201c3d1c005828234ece3e25e620dcc9':
Refine fix I53e91db7 to apply only to wifi network
Merge commit '3cc68d3379689b0c970ce33a56749a61a73047bd' into eclair-plus-aosp
* commit '3cc68d3379689b0c970ce33a56749a61a73047bd':
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
Merge commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750' into eclair-plus-aosp
* commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750':
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
Merge commit '2b17d4bf67be078e262fd5104277f6ffe725ca5d'
* commit '2b17d4bf67be078e262fd5104277f6ffe725ca5d':
Add bugreport info about network feature use. DO NOT MERGE
Merge commit '9fdf82e080ea20086378e751ace245a4a1b022dc' into eclair-plus-aosp
* commit '9fdf82e080ea20086378e751ace245a4a1b022dc':
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
Merge commit '1a337547d5377c57dbb10a24d4d73ad6bda829ea' into eclair-plus-aosp
* commit '1a337547d5377c57dbb10a24d4d73ad6bda829ea':
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
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
The MOBILE_MMS, MOBILE_SUPL, MOBILE_DUN and MOBILE_HIPRI net types used
by location, messaging, and vending needed to be exposed.
Bug: 2363272
Change-ID: I6d2361d3642064db619b283b9217512563eb3439
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
Merge commit '112c980a3d3fd8873dbc44006436aff80535808e'
* commit '112c980a3d3fd8873dbc44006436aff80535808e':
Implement API to have new broadcasts replace existing broadcasts.
Merge commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e' into eclair-mr2-plus-aosp
* commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e':
Implement API to have new broadcasts replace existing broadcasts.
Use this in various places where it should serve no purpose to deliver
both broadcasts. This is intended to reduce somewhat the flurry of
broadcasts that we churn through during boot.
Merge commit 'f59a2ae61e985a54f897c5f95977dc0d08e8dbe6' into eclair-mr2-plus-aosp
* commit 'f59a2ae61e985a54f897c5f95977dc0d08e8dbe6':
DO NOT MERGE Reverting change I53e91db7.
Merge commit '9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-mr2
* commit '9ae9763b7e5dd872619b13c889b72b0df176f956':
DO NOT MERGE Reverting change I53e91db7.
Merge commit '9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-plus-aosp
* commit '9ae9763b7e5dd872619b13c889b72b0df176f956':
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
Merge commit 'd6b70351f823af91a97b9238b219653181cf8dca' into eclair-mr2-plus-aosp
* commit 'd6b70351f823af91a97b9238b219653181cf8dca':
Filter out minor Connectivity Notifications.
Merge commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-mr2
* commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
Filter out minor Connectivity Notifications.
Merge commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-plus-aosp
* commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
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
Merge commit '48476b0ade7594a64612db2b867792737193b2ec' into eclair-mr2-plus-aosp
* commit '48476b0ade7594a64612db2b867792737193b2ec':
move event log tags used by system server into this package
We can now locate event log tag definitions in individual packages
(and java constants for the tag numbers get auto-generated), so move
all the tags used by the system server into the package.
