Commit Graph

1102 Commits

Author SHA1 Message Date
Paul Jensen
fa28d8952f Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev am: eaa8684da7 am: 6a8a98c57a
am: 1b52fcfc1d

* commit '1b52fcfc1db74d63fcb3a873700cf1beea3dfb93':
  Cap number of NetworkRequests a UID can make to 100

Change-Id: I72fe474d3618c2900e972cefdc85e80767610405
2016-04-21 13:59:20 +00:00
Paul Jensen
6a8a98c57a Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev
am: eaa8684da7

* commit 'eaa8684da7ef1148e347118f1a4b146caea108a1':
  Cap number of NetworkRequests a UID can make to 100

Change-Id: Ic664fa080316eff75dd22fc8e84431cb0eb903be
2016-04-21 13:54:53 +00:00
Paul Jensen
eaa8684da7 Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev 2016-04-21 13:47:13 +00:00
Hugo Benichi
d937aed3da Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: eb8372d38c
am: 1e7c9fb57e

* commit '1e7c9fb57e25d22c2d5a48a590728f6bb7875360':
  Some fixes in ConnectivityService event logging

Change-Id: Icb50bdab260da6476c1d1148fa2d8995b106a809
2016-04-21 04:19:53 +00:00
Hugo Benichi
1e7c9fb57e Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de
am: eb8372d38c

* commit 'eb8372d38c31af196285d2fee60ae53adb113eca':
  Some fixes in ConnectivityService event logging

Change-Id: Ie356b2df2b84b36e6a2a52d3246ff434557ee89b
2016-04-21 04:15:10 +00:00
Hugo Benichi
6ab129c8e4 Merge "Some fixes in ConnectivityService event logging" into nyc-dev
am: 7261fb27de

* commit '7261fb27de16bb6d3ebd81bd3b73062bd212ea7e':
  Some fixes in ConnectivityService event logging

Change-Id: I0ca861a1d35eb6cdb5490d04a725d64465eebc31
2016-04-21 04:12:56 +00:00
Hugo Benichi
436d22e6b8 Some fixes in ConnectivityService event logging
Bug: 28204408
Change-Id: I44ed9539bb213a845c2bcc2861c947af7c3c9ef4
2016-04-21 11:03:08 +09:00
Felipe Leme
568afabb65 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba am: 0627850
am: 4988f49

* commit '4988f49b8399c23896cf77ac411af35f5c045b6e':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: Iae1c0af0aec6dba501249c0db08ade5a36f99607
2016-04-20 21:29:18 +00:00
TreeHugger Robot
4988f49b83 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba
am: 0627850

* commit '0627850430ba3dad041891de570e0d08e22c13d2':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: I278f8b4f8e29ea69b15e7bef9556c0ed0a81c82b
2016-04-20 21:11:50 +00:00
Felipe Leme
863b80d607 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev
am: 9724fba

* commit '9724fba83545fd075cbda62bb13cdc7820c7291a':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: I1ee90168f1cf29a117961ba1e269fbc89c7f443b
2016-04-20 21:10:41 +00:00
Paul Jensen
7b87065990 Cap number of NetworkRequests a UID can make to 100
This prevents DoSing ConnectivityService with too many requests.

Fixes: 27253080
Change-Id: Id0480d220b2f01b9ef1146bef8ead2fc8287e28d
2016-04-20 10:52:47 -04:00
Felipe Leme
987d8ef741 Added onRestrictBackgroundWhitelistChanged callback.
When users add or remove an app to the Data Saver Mode whitelist, the
app is notified through a
ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED. But besides this
broadcast, it's also necessary to notify internal apps such Settings,
hence a new method is being added to INetworkPolicyListener.

BUG: 27481520
Change-Id: I1537a77becf6b7da1535ed5faabdc894fd9f7084
2016-04-19 12:06:00 -07:00
Narayan Kamath
c0465659b9 Remove unnecessary allocation+unboxing of objects. am: 46f0dd6 am: 4c89ae0
am: 1e222ff

* commit '1e222ff323abdf061a46bfb4d297780eadd0968d':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: Ic48935549f7f9b13d5f0a2d98fc0979fbfc5a38b
2016-04-18 10:42:28 +00:00
Lorenzo Colitti
2b7db0cba5 resolve merge conflicts of 72fa0d4 to nyc-dev-plus-aosp am: 57f1e32
am: 0928b62

* commit '0928b620d2f0b78d49b13059eba475da4801ad70':
  When the applicantion is removed, reset network permission of this uid.

Change-Id: I3750e3f805bfc71558025fe078f1ad25e5af7cff
2016-04-18 10:36:38 +00:00
Narayan Kamath
1e222ff323 Remove unnecessary allocation+unboxing of objects. am: 46f0dd6
am: 4c89ae0

* commit '4c89ae0ee4f3d73d84843bf05cdc328b5e821da3':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: I46f5ec0b9b8bc14073bcf7dc643bc909072d53ff
2016-04-18 10:36:37 +00:00
Narayan Kamath
93aa6a7f96 Remove unnecessary allocation+unboxing of objects.
am: 46f0dd6

* commit '46f0dd69cdbc4fd8bac8330425f79dca3be4d4a1':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: Idfffa8fad0f6bcffa954752910524bdc879d65b7
2016-04-18 10:31:37 +00:00
Lorenzo Colitti
57f1e32f15 resolve merge conflicts of 72fa0d4 to nyc-dev-plus-aosp
Change-Id: Id7f317a20e422b215efff89a5c71c9b445d18cf4
2016-04-18 17:58:31 +09:00
Narayan Kamath
46f0dd69cd Remove unnecessary allocation+unboxing of objects.
Transforming String->int can be done with 0 allocations
using Integer.parseInt.

bug: 28078871
Change-Id: I8d9f322d7154728849dde61ef282046032858d60
2016-04-18 09:55:59 +01:00
TreeHugger Robot
8756817fb4 Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev am: 0628d32
am: 886d17c

* commit '886d17c035805cef3bce3d2d96e53ba48bf5b62b':
  Also log IPv4 and IPv6 connectivity of any previous default network

Change-Id: I8c82f1058531d1f5a0cdb73314b8fd742dae7860
2016-04-14 19:26:50 +00:00
Pierre Imai
a6b1155d31 Merge changes Ia71865a9,I40b6de54 into nyc-dev am: 1feca76
am: f8ef3c3

* commit 'f8ef3c36a97b68b5e27127681973244f481cca09':
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.

Change-Id: If019f2c448ed3411a0b23dfdd6038e1b9fe2099d
2016-04-14 18:51:38 +00:00
Erik Kline
abdd3f8a9f Also log IPv4 and IPv6 connectivity of any previous default network
Change-Id: I07595c0a131fea21914f524949cd64af87403b88
2016-04-14 17:54:46 +09:00
Pierre Imai
5aeed109f7 Log an event whenever we lose the default network.
Change-Id: Ia71865a90b2db5dc0d3ad627563a6b1f99686f04
2016-04-14 15:38:29 +09:00
Pierre Imai
96ad7c5550 Record the transport types for connectivity events.
BUG: 25691077
Change-Id: I40b6de5446325e717c0356603fd66cd395db9acb
2016-04-14 15:38:17 +09:00
Paul Jensen
f2f05c4e50 Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev am: 45e879c
am: 2c1f03a

* commit '2c1f03ade023a61428b7d9101bc10e4c88ae941a':
  If Internet probe is redirected, pass redirect destination to NetworkAgent.

Change-Id: I4c5f5cb8591d8729de9036a6c2aabacd4aba0f39
2016-04-13 02:02:13 +00:00
Paul Jensen
9c9e48fbd1 If Internet probe is redirected, pass redirect destination to NetworkAgent.
Transport may use the redirect to make additional determination about network
state.

Bug: 25203607
Change-Id: I07d8918f13fdcbe0b6fd757536bfc1850a2a244f
2016-04-12 08:54:36 -04:00
Lorenzo Colitti
0ff1c591c3 Merge "Reinstate much-reduced ConnectivityService logging." into nyc-dev am: facc09d
am: fb1a323

* commit 'fb1a323da6f07a90355efa8de9f3b84842c0ad2f':
  Reinstate much-reduced ConnectivityService logging.

Change-Id: I948e337c16115e27177700af0f9ddc4ac7a77e0a
2016-04-11 16:21:50 +00:00
Lorenzo Colitti
facc09db55 Merge "Reinstate much-reduced ConnectivityService logging." into nyc-dev 2016-04-11 16:08:52 +00:00
Lorenzo Colitti
cf5320fd42 Merge changes Ic2c84de7,I379aef92 into nyc-dev am: cbb62db
am: 73ab8fd

* commit '73ab8fd683a5c2d363952cf6d30be04c85537530':
  Remove duplicated code in NetworkStateTrackerHandler.
  Improve Tethering and NativeDaemonConnector logging.

Change-Id: Iddd137e805233fb5026493fb57b32dcff4159092
2016-04-11 14:41:39 +00:00
Lorenzo Colitti
cbb62db80e Merge changes Ic2c84de7,I379aef92 into nyc-dev
* changes:
  Remove duplicated code in NetworkStateTrackerHandler.
  Improve Tethering and NativeDaemonConnector logging.
2016-04-11 14:27:31 +00:00
Lorenzo Colitti
ebf757df41 Reinstate much-reduced ConnectivityService logging.
Change-Id: I9d1292f8c036be2a854fdb537f4ccb957d211966
2016-04-11 23:19:06 +09:00
Lorenzo Colitti
b54bea91bc Remove duplicated code in NetworkStateTrackerHandler.
Also use MessageUtils to decode message names.

Change-Id: Ic2c84de73fbf3eb10cc9634a083e5d3b3ffb807a
2016-04-11 17:40:22 +09:00
Jack Yu
62f081298d Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev am: 18c98fe
am: 6754d23

* commit '6754d237bb8c6e1fba779f90417b4a2fe07d2b3e':
  Excluded certain APNs (e.g. IMS) from mobile data usage.

Change-Id: I0f37f4d296de88763019f469a0356e753b9f3636
2016-04-09 06:25:54 +00:00
Jack Yu
18c98fed4d Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev 2016-04-09 03:30:31 +00:00
Jack Yu
e1e361a669 Excluded certain APNs (e.g. IMS) from mobile data usage.
Added not_metered capability to a mobile network if none
of its associated APN types are metered. Also used not_metered
capability to determine if a network should be accounted for
data usage or not instead of using network type, which is
always MOBILE after refactoring. Will add VT usage support
in next phase.

bug: 20888836
Change-Id: Id692cb856be9a47d0e918371112630128965b1bb
2016-04-07 10:07:31 -07:00
Robin Lee
908a75e480 Merge "Internal API for system apps to determine default network for other apps" into nyc-dev am: 80f2000
am: a948f88

* commit 'a948f8872aa045ab22f42285f195fdb413c5ff66':
  Internal API for system apps to determine default network for other apps

Change-Id: Ib719f0cebb41afe4aa52241f3797598a7e468d2d
2016-04-07 16:51:53 +00:00
Robin Lee
80f2000491 Merge "Internal API for system apps to determine default network for other apps" into nyc-dev 2016-04-07 16:43:15 +00:00
Robin Lee
5b52bef8d8 Internal API for system apps to determine default network for other apps
Callers with CONNECTIVITY_INTERNAL permission can read off the netId
that an application is assigned to by default.

Necessary for making connections as the default network for a client
app eg. when downloading stuff on its behalf.

Bug: 27074270
Change-Id: I8d35e8e99126875f55f3c545090326f3e9be43fb
2016-04-07 14:55:59 +00:00
Erik Kline
1fb9333459 Don\'t flush DNS cache on route changes. am: b988890
am: 09a5fbd

* commit '09a5fbd6ec86000f95423a47e9266ee124609cb3':
  Don't flush DNS cache on route changes.

Change-Id: I0e019a46548bbc81628939989fad39f96bc83ebe
2016-04-06 04:00:25 +00:00
Erik Kline
b988890b21 Don't flush DNS cache on route changes.
Since Lollipop, routes are isolated within Networks.  Flushing a
Network's DNS cache whenever that same Network's routes are updated
doesn't provide any benefit.  Any system components depending on this
behaviour need to uncovered and fixed.

Additionally, clean up no-longer-used flushNetworkDnsCache().  This
should be replaced, when needed, by a proper binder interface to netd.

Change-Id: I34bf79e4839da014d466058a876d754209d0c007
2016-04-06 11:30:51 +09:00
Erik Kline
62ba687155 Merge "Delete unused default DNS setting code" into nyc-dev am: 39ca5c2
am: 2e6eeed

* commit '2e6eeed7d321f468f9434927f0ca433926044bec':
  Delete unused default DNS setting code

Change-Id: I28efdd6bd2b1cbaf0936fcd7d0104b8bf3f27647
2016-04-05 04:09:44 +00:00
Erik Kline
85fc29e714 Delete unused default DNS setting code
Change-Id: I601a647714171f205d179d6fef6c112949fc5a94
2016-04-05 11:48:01 +09:00
Lorenzo Colitti
62d97981db Merge "Add a toString method to ApfCapabilities." into nyc-dev am: 36e480c
am: 366ce8a

* commit '366ce8a8d92b3368c51b7d7f1408eadcddcaf96c':
  Add a toString method to ApfCapabilities.

Change-Id: Iee5554cdabab4fe8a274faed22e0d56c48c64317
2016-03-29 08:17:35 +00:00
Lorenzo Colitti
bd0c0af47f Add a toString method to ApfCapabilities.
Change-Id: I505b90b7cd818cb3477990ec6b41b16db46d1c08
2016-03-28 17:33:30 +09:00
Paul Jensen
7e35dac240 Merge "Move ApfFilter from ConnectivityService to IpManager" into nyc-dev am: 732340c
am: ebdf3f0

* commit 'ebdf3f006854b04de2508314be7ac0788b6faa99':
  Move ApfFilter from ConnectivityService to IpManager
2016-03-25 13:01:09 +00:00
Paul Jensen
6b7f7a0852 Move ApfFilter from ConnectivityService to IpManager
There's a few advantages to having ApfFilter in IpManager:
1. If things go wrong, crashing a particular transport is less bad then
   crashing ConnectivityService.  We also don't want to use
   ConnectivityService as a dumping ground for transport-specific logic.
2. This makes implementing WifiManager.MulticastLock a lot simpler and
   safer because enabling/disabling it doesn't have to go through the
   NetworkAgent, which could risk various races (e.g. installing a filter
   into the wrong WiFi network).
3. IpManager is the ultimate source for LinkProperties for a particular
   transport and since ApfFilter uses the LinkProperties it's better to
   have it closely paired with the IpManager. Likewise, ApfFilter needs
   to know the APF capabilities of the transport, so having it in
   the transport avoids having to parcel this information through the
   NetworkAgent.

Bug: 26238573
Change-Id: I99b85f2b64972f0e7572170ec5d1926081aa3429
2016-03-25 07:46:07 -04:00
Pierre Imai
7d65e52f5d Merge "Add initial connectivity metrics handling." into nyc-dev am: 1ed762c
am: 0abbcda

* commit '0abbcda3ad85b523fc1eef27f76f0d642c19245b':
  Add initial connectivity metrics handling.
2016-03-25 06:25:23 +00:00
Pierre Imai
1ed762c929 Merge "Add initial connectivity metrics handling." into nyc-dev 2016-03-25 06:17:36 +00:00
Pierre Imai
194a57644d Add initial connectivity metrics handling.
Adds initial support for IP connectivity metrics collection (DHCP
client, IP reachability monitor, network monitor, connectivity
service).

Change-Id: If9a0455f2a34aa9abea90f9c1b38e4d895dc1a72
2016-03-25 13:21:41 +09:00
Erik Kline
f2a536f7b5 Merge "Add "track default" type to NetworkRequestInfo" into nyc-dev am: 3e4c79e4
am: 6d54e91

* commit '6d54e91479d185030cd167d292441d7bd9321c9f':
  Add "track default" type to NetworkRequestInfo
2016-03-24 04:29:45 +00:00
Erik Kline
2c61a26366 Add "track default" type to NetworkRequestInfo
The "default network tracking" request is somewhere between a listen
and a request, in previous semantics. It is more like a listen in that
it doesn't cause any network to be brought up, but also like a request
in that will only get callbacks about a single network at a time (not
all networks that might match).

This change minimally splits the NetworkRequest types into 3: LISTEN,
REQUEST, and TRACK_DEFAULT.

Change-Id: I2d113b2f6eed526a7808592bce0118260a56f77c
2016-03-24 12:52:54 +09:00